1
0
mirror of https://github.com/chinchang/web-maker.git synced 2025-06-08 18:54:49 +02:00

merge master

This commit is contained in:
Kushagra Gour 2019-02-12 16:05:59 +05:30
commit 7cb7d86dbd
8 changed files with 30 additions and 8 deletions

View File

@ -18,6 +18,7 @@ or
- Works offline - Works offline
- Quick creation & good-old files mode - Quick creation & good-old files mode
- Inbuilt Console - Inbuilt Console
- Save and load your creations
- Auto-save feature - Auto-save feature
- Code auto-completion - Code auto-completion
- Easy addition of popular JS & CSS libraries - 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 MIT Licensed
Copyright (c) 2018 Kushagra Gour, [webmakerapp.com](https://webmakerapp.com) Copyright (c) 2016-2019 Kushagra Gour, [webmakerapp.com](https://webmakerapp.com)

View File

@ -1069,6 +1069,18 @@
} }
</script> </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> </body>

View File

@ -1,6 +1,6 @@
{ {
"name": "web-maker", "name": "web-maker",
"version": "3.6.1", "version": "3.6.2",
"description": "A blazing fast & offline web playground", "description": "A blazing fast & offline web playground",
"scripts": { "scripts": {
"start": "if-env NODE_ENV=production && npm run -s serve || npm run -s dev", "start": "if-env NODE_ENV=production && npm run -s serve || npm run -s dev",

View File

@ -106,7 +106,14 @@ export function Notifications(props) {
<div> <div>
<h1>Whats new?</h1> <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"> <NotificationItem type="bug">
Failing to import local creations when logging in. Failing to import local creations when logging in.
</NotificationItem> </NotificationItem>

View File

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

View File

@ -1,5 +1,6 @@
window.addEventListener('message', e => { window.addEventListener('message', e => {
if (e.data && e.data.contents) { // Web app
if (e.data && e.data.contents && e.data.contents.match(/<html/)) {
const frame = document.querySelector('iframe'); const frame = document.querySelector('iframe');
frame.src = frame.src; frame.src = frame.src;
setTimeout(() => { setTimeout(() => {
@ -7,7 +8,8 @@ window.addEventListener('message', e => {
frame.contentDocument.write(e.data.contents); frame.contentDocument.write(e.data.contents);
frame.contentDocument.close(); frame.contentDocument.close();
}, 10); }, 10);
} else { } else if (e.data && e.data.match(/preview\.html/)) {
// Chrome extension
document.querySelector('iframe').src = e.data; document.querySelector('iframe').src = e.data;
} }
}); });

View File

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

View File

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