mirror/php-web-maker
1
0
Fork 0
mirror of https://github.com/chinchang/web-maker.git synced 2025-01-29 18:47:38 +01:00
Code Issues Releases Wiki Activity

resolve conflict n merge master

Browse Source
This commit is contained in:
Kushagra Gour 2019-02-28 17:04:51 +05:30
commit c14b6d2336
8 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -18,6 +18,7 @@ or
- Works offline
- Quick creation & good-old files mode
- Inbuilt Console
- Save and load your creations
- Auto-save feature
- Code auto-completion
- Easy addition of popular JS & CSS libraries
@ -47,4 +48,4 @@ Web Maker stays stable as rock with every release, thanks to the sponsored testi
MIT Licensed
Copyright (c) 2018 Kushagra Gour, [webmakerapp.com](https://webmakerapp.com)
Copyright (c) 2016-2019 Kushagra Gour, [webmakerapp.com](https://webmakerapp.com)

12
index.html
View File

@ -1069,6 +1069,18 @@
}
</script>
<script type="text/javascript">
window.$crisp = [];
window.CRISP_WEBSITE_ID = "c00b07b9-42da-45dd-87b0-e614bf7fb240";
(function () {
d = document;
s = d.createElement("script");
s.src = "https://client.crisp.chat/l.js";
s.async = 1;
d.getElementsByTagName("head")[0].appendChild(s);
})();
</script>
</body>

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "web-maker",
"version": "3.6.1",
"version": "3.6.2",
"description": "A blazing fast & offline web playground",
"scripts": {
"start": "npm run -s dev && gulp start-preview-server",

9
src/components/Notifications.jsx
View File

@ -106,7 +106,14 @@ export function Notifications(props) {
<div>
<h1>Whats new?</h1>
<Notification version="3.6.1" {...props} isLatest={true}>
<Notification version="3.6.2" {...props} isLatest={true}>
<NotificationItem type="bug">
"404 Page not found" showing up in preview window when in detached
mode.
</NotificationItem>
</Notification>
<Notification version="3.6.1" {...props}>
<NotificationItem type="bug">
Failing to import local creations when logging in.
</NotificationItem>

2
src/components/app.jsx
View File

@ -77,7 +77,7 @@ const LocalStorageKeys = {
ASKED_TO_IMPORT_CREATIONS: 'askedToImportCreations'
};
const UNSAVED_WARNING_COUNT = 15;
const version = '3.6.1';
const version = '3.6.2';
export default class App extends Component {
constructor() {

4
src/detached-window.js
View File

@ -1,6 +1,6 @@
window.addEventListener('message', e => {
// Recieving from app window
if (e.data && e.data.contents) {
if (e.data && e.data.contents && e.data.contents.match(/<html/)) {
const frame = document.querySelector('iframe');
frame.src = frame.src;
setTimeout(() => {
@ -9,7 +9,7 @@ window.addEventListener('message', e => {
frame.contentDocument.close();
}, 10);
}
if (e.data && e.data.url) {
if (e.data && e.data.url && e.data.match(/preview\.html/)) {
document.querySelector('iframe').src = e.data.url;
}

2
src/manifest.json
View File

@ -1,6 +1,6 @@
{
"name": "Web Maker",
"version": "3.6.1",
"version": "3.6.2",
"manifest_version": 2,
"description": "Blazing fast & offline playground for your web experiments",
"homepage_url": "https://webmakerapp.com",

2
src/options.html
View File

@ -37,7 +37,7 @@
<body>
<h3>Settings
<span style="opacity: 0.6;font-size:0.7em;">
v3.6.1</span>
v3.6.2</span>
</h3>
<form name="optionsForm">
<label>