Scener editor: reloads page when the editor is active.

PhaserEditor2D · May 27, 2019 · 513de5a · 513de5a
1 parent 09d279f
commit 513de5a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 3 deletions.
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/Editor.ts b/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/Editor.ts
@@ -213,8 +213,7 @@ namespace PhaserEditor2D {
 
         private onReloadPage() {
             this._socket.close();
-            // window.location.reload();
-            window.location.href = window.location.href;
+            window.location.reload();
         }
 
         private onUpdateSceneProperties(msg: any) {

diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/out/Editor.js b/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/out/Editor.js
@@ -157,7 +157,7 @@ var PhaserEditor2D;
         };
         Editor.prototype.onReloadPage = function () {
             this._socket.close();
-            window.location.href = window.location.href;
+            window.location.reload();
         };
         Editor.prototype.onUpdateSceneProperties = function (msg) {
             this.sceneProperties = msg.sceneProperties;

diff --git a/...asereditor/phasereditor.scene.ui.editor/src/phasereditor/scene/ui/editor/SceneEditor.java b/...asereditor/phasereditor.scene.ui.editor/src/phasereditor/scene/ui/editor/SceneEditor.java
@@ -133,6 +133,7 @@ public String getLabel() {
 	private IContextActivation _searchContextActivation;
 	private SceneEditorBlockProvider _blocksProvider;
 	private IPartListener _partListener;
+	private boolean _pendingBuild;
 
 	public SceneEditor() {
 		_outlinerSelectionListener = new ISelectionChangedListener() {
@@ -260,6 +261,16 @@ private void reloadMethod() {
 	}
 
 	public void build() {
+		if (this == getEditorSite().getPage().getActiveEditor()) {
+			realBuild();
+		} else {
+			_pendingBuild = true;
+		}
+	}
+
+	private void realBuild() {
+		_pendingBuild = false;
+
 		updatePropertyPagesContentWithSelection();
 
 		refreshOutline();
@@ -587,6 +598,10 @@ public void partActivated(IWorkbenchPart part) {
 					var actionBars = getEditorSite().getActionBars();
 					_undoRedoGroup.fillActionBars(actionBars);
 					actionBars.updateActionBars();
+
+					if (_pendingBuild) {
+						realBuild();
+					}
 				}
 			}
 		};

diff --git a/...sereditor/phasereditor.scene.ui.editor/src/phasereditor/scene/ui/editor/SceneWebView.java b/...sereditor/phasereditor.scene.ui.editor/src/phasereditor/scene/ui/editor/SceneWebView.java
@@ -42,6 +42,7 @@ public class SceneWebView extends Composite {
 	private IBrowser _webView;
 	private SceneEditor _editor;
 
+
 	public SceneWebView(SceneEditor editor, Composite parent, int style) {
 		super(parent, style);
 		var layout = new FillLayout();
@@ -50,6 +51,7 @@ public SceneWebView(SceneEditor editor, Composite parent, int style) {
 		setLayout(layout);
 
 		_editor = editor;
+
 
 		_webView = IBrowser.create(this, SWT.NONE);
 

diff --git a/source/v2/releng/.project b/source/v2/releng/.project
@@ -19,5 +19,10 @@
 			<type>1</type>
 			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/pom.xml</locationURI>
 		</link>
+		<link>
+			<name>scripts</name>
+			<type>2</type>
+			<location>/home/arian/Documents/PhaserEditor/Public/scripts</location>
+		</link>
 	</linkedResources>
 </projectDescription>