Merge pull request #39 from PhaserEditor2D/develop

Release 3.1.1
PhaserEditor2D · May 26, 2020 · 7cf377d · 7cf377d
2 parents 1d4fbab + 1314104
commit 7cf377d
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 15 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -1,5 +1,14 @@
 # Change Log
 
+## Version 3.1.1 - May 25, 2020
+
+### Fixed
+
+* [#33](https://github.com/PhaserEditor2D/PhaserEditor2D-v3/issues/33) Wrong BitmapText default origin.
+* [#32](https://github.com/PhaserEditor2D/PhaserEditor2D-v3/issues/32) The server checks if there is a new version available. 
+* Monaco (code) editor updates content with external changes only if the flag `-enable-advanced-js-editor` is set. Now it updates always.
+* [#37](https://github.com/PhaserEditor2D/PhaserEditor2D-v3/issues/37) TypeScript project template opens the README file the first time, with the instructions to run the project. 
+
 ## Version 3.1.0 - May 24, 2020
 
 ### Added

diff --git a/source/editor/plugins/phasereditor2d.code/plugin.json b/source/editor/plugins/phasereditor2d.code/plugin.json
@@ -6,15 +6,13 @@
     ],
     "scripts": [
         "_out/phasereditor2d.code.js",
-        "scripts/showdown-1.9.0/showdown.min.js",
         "scripts/monaco-editor-0.20.0/defineRequire.js",
         "scripts/monaco-editor-0.20.0/min/vs/loader.js",
         "scripts/monaco-editor-0.20.0/min/vs/editor/editor.main.nls.js",
         "scripts/monaco-editor-0.20.0/min/vs/editor/editor.main.js"
     ],
     "scripts-dev": [
         "_out/phasereditor2d.code.js",
-        "scripts/showdown-1.9.0/showdown.min.js",
         "scripts/dev-monaco-editor-0.20.0/defineRequire.js",
         "scripts/dev-monaco-editor-0.20.0/dev/vs/loader.js",
         "scripts/dev-monaco-editor-0.20.0/dev/vs/editor/editor.main.nls.js",

diff --git a/source/editor/plugins/phasereditor2d.code/scripts/showdown-1.9.0/showdown.min.js b/source/editor/plugins/phasereditor2d.code/scripts/showdown-1.9.0/showdown.min.js
diff --git a/source/editor/plugins/phasereditor2d.code/src/ui/ModelManager.ts b/source/editor/plugins/phasereditor2d.code/src/ui/ModelManager.ts
@@ -25,7 +25,7 @@ namespace phasereditor2d.code.ui {
 
                 for (const fileName of e.getAddRecords()) {
 
-                    if (!this.isValidFileName(fileName)) {
+                    if (!ModelManager.handleFileName(fileName)) {
 
                         continue;
                     }
@@ -43,7 +43,7 @@ namespace phasereditor2d.code.ui {
 
                 for (const fileName of e.getDeleteRecords()) {
 
-                    if (!this.isValidFileName(fileName)) {
+                    if (!ModelManager.handleFileName(fileName)) {
 
                         continue;
                     }
@@ -60,7 +60,7 @@ namespace phasereditor2d.code.ui {
 
                 for (const fileName of e.getModifiedRecords()) {
 
-                    if (!this.isValidFileName(fileName)) {
+                    if (!ModelManager.handleFileName(fileName)) {
 
                         continue;
                     }
@@ -81,7 +81,7 @@ namespace phasereditor2d.code.ui {
 
                 for (const oldFileName of e.getRenameFromRecords()) {
 
-                    if (!this.isValidFileName(oldFileName)) {
+                    if (!ModelManager.handleFileName(oldFileName)) {
 
                         continue;
                     }
@@ -105,7 +105,7 @@ namespace phasereditor2d.code.ui {
             return filename.endsWith(".js") ? "javascript" : "typescript";
         }
 
-        private isValidFileName(filename: string) {
+        public static handleFileName(filename: string) {
 
             return filename.endsWith(".js") || filename.endsWith(".ts");
         }

diff --git a/source/editor/plugins/phasereditor2d.code/src/ui/editors/MonacoEditor.ts b/source/editor/plugins/phasereditor2d.code/src/ui/editors/MonacoEditor.ts
@@ -270,9 +270,19 @@ namespace phasereditor2d.code.ui.editors {
             }
         }
 
-        protected onEditorInputContentChanged() {
+        protected async onEditorInputContentChanged() {
 
-            // handled by the ModelManager.
+            if (CodePlugin.getInstance().isAdvancedJSEditor()) {
+
+                if (ModelManager.handleFileName(this.getInput().getName())) {
+                    // do nothing, the model manager will handle this!
+                    return;
+                }
+            }
+
+            const str = await colibri.ui.ide.FileUtils.preloadAndGetFileString(this.getInput());
+
+            this.getModel().setValue(str);
         }
     }
 }
diff --git a/source/editor/plugins/phasereditor2d.ide/src/IDEPlugin.ts b/source/editor/plugins/phasereditor2d.ide/src/IDEPlugin.ts
@@ -264,7 +264,7 @@ namespace phasereditor2d.ide {
 
     /* program entry point */
 
-    export const VER = "3.1.0";
+    export const VER = "3.1.1";
 
     async function main() {
 

diff --git a/source/editor/plugins/phasereditor2d.scene/src/ui/sceneobjects/object/OriginComponent.ts b/source/editor/plugins/phasereditor2d.scene/src/ui/sceneobjects/object/OriginComponent.ts
@@ -53,7 +53,7 @@ namespace phasereditor2d.scene.ui.sceneobjects {
 
             let defaultValue = 0.5;
 
-            if (obj instanceof Text) {
+            if (obj instanceof Text || obj instanceof BitmapText) {
 
                 defaultValue = 0;
             }

diff --git a/source/templates/providers/Phaser Editor 2D/Basic TypeScript/template.json b/source/templates/providers/Phaser Editor 2D/Basic TypeScript/template.json
@@ -1,5 +1,5 @@
 {
 	"openFiles": [
-		"scenes/Level.scene"
+		"README.TXT"
 	]
 }