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

Merge remote-tracking branch 'origin/master' into v5

Browse Source
This commit is contained in:
Kushagra Gour
2019-07-18 15:34:02 +05:30
parent a607b9c9e5 bbdfda57db
commit e9ed42965b
6 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "web-maker", "name": "web-maker",
"version": "4.0.2", "version": "4.0.3",
"description": "A blazing fast & offline web playground", "description": "A blazing fast & offline web playground",
"scripts": { "scripts": {
"start": "npm run -s dev", "start": "npm run -s dev",

2
src/components/CodeEditor.jsx
View File

@@ -161,8 +161,6 @@ export default class CodeEditor extends Component {
}); });
} }
setLanguage(value) { setLanguage(value) {
if (!window.monaco) return;
this.editorReadyDeferred.promise.then(() => { this.editorReadyDeferred.promise.then(() => {
if (this.props.type === 'monaco') { if (this.props.type === 'monaco') {
monaco.editor.setModelLanguage( monaco.editor.setModelLanguage(

8
src/components/Notifications.jsx
View File

@@ -114,7 +114,13 @@ export function Notifications(props) {
return ( return (
<div> <div>
<h1>Whats new?</h1> <h1>Whats new?</h1>
<Notification version="4.0.2" {...props} isLatest={true}> <Notification version="4.0.3" {...props} isLatest={true}>
<NotificationItem>
Broken syntax highlighting in non-default Preprocessors.
</NotificationItem>
</Notification>
<Notification version="4.0.2" {...props}>
<li> <li>
You can now override settings through query parameters. Currently only{' '} You can now override settings through query parameters. Currently only{' '}
<strong>autoPreview</strong> and <strong>isMonacoEditorOn</strong> are <strong>autoPreview</strong> and <strong>isMonacoEditorOn</strong> are

2
src/components/app.jsx
View File

@@ -78,7 +78,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 = '4.0.2'; const version = '4.0.3';
// Read forced settings as query parameters // Read forced settings as query parameters
window.forcedSettings = {}; window.forcedSettings = {};

2
src/manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "Web Maker", "name": "Web Maker",
"version": "4.0.2", "version": "4.0.3",
"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://webmaker.app", "homepage_url": "https://webmaker.app",

2
src/options.html
View File

@@ -35,7 +35,7 @@
<body> <body>
<h3> <h3>
Settings Settings
<span style="opacity: 0.6;font-size:0.7em;"> v4.0.1</span> <span style="opacity: 0.6;font-size:0.7em;"> v4.0.3</span>
</h3> </h3>
<form name="optionsForm"> <form name="optionsForm">
<label> <label>