- Fixed tree-state-history issue on OnDisk projet

- Fixed closing all opened editors during project close (reference #669)
Moonshine-IDE · May 12, 2020 · 020f865 · 020f865
1 parent ea1f308
commit 020f865
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/ide/MoonshineSharedCore/src/actionScripts/plugin/ondiskproj/importer/OnDiskImporter.as b/ide/MoonshineSharedCore/src/actionScripts/plugin/ondiskproj/importer/OnDiskImporter.as
@@ -18,8 +18,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 package actionScripts.plugin.ondiskproj.importer
 {
-	import flash.filesystem.File;
-
 	import actionScripts.factory.FileLocation;
 	import actionScripts.locator.IDEModel;
 	import actionScripts.plugin.core.importer.FlashDevelopImporterBase;

diff --git a/ide/MoonshineSharedCore/src/actionScripts/ui/tabview/TabViewTab.as b/ide/MoonshineSharedCore/src/actionScripts/ui/tabview/TabViewTab.as
@@ -18,8 +18,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 package actionScripts.ui.tabview
 {
-    import actionScripts.ui.tabNavigator.CloseTabButton;
-
     import flash.display.Sprite;
     import flash.events.ContextMenuEvent;
     import flash.events.Event;
@@ -34,9 +32,11 @@ package actionScripts.ui.tabview
 
     import spark.components.Label;
 
+    import actionScripts.ui.IFileContentWindow;
     import actionScripts.ui.editor.BasicTextEditor;
+    import actionScripts.ui.tabNavigator.CloseTabButton;
     import actionScripts.utils.SharedObjectUtil;
-    import actionScripts.valueObjects.ConstantsCoreVO;
+    import actionScripts.valueObjects.ConstantsCoreVO;
 
 	public class TabViewTab extends UIComponent
 	{	
@@ -105,16 +105,17 @@ package actionScripts.ui.tabview
 			if (_data != value)
 			{
 				_data = value;
-				if (value is BasicTextEditor)
+				if (value is IFileContentWindow)
 				{
-					var editor:BasicTextEditor = value as BasicTextEditor;
+					var projectPath:String = value.hasOwnProperty("projectPath") ? value["projectPath"] : null;
+					var editor:IFileContentWindow = value as IFileContentWindow;
 					if (editor.currentFile)
                     {
                         this.contextMenu = createContextMenu();
                         SharedObjectUtil.saveLocationOfOpenedProjectFile(
 								editor.currentFile.name,
                                 editor.currentFile.fileBridge.nativePath,
-								editor.projectPath);
+								projectPath);
                     }
 				}
 			}

diff --git a/ide/MoonshineSharedCore/src/actionScripts/utils/UtilsCore.as b/ide/MoonshineSharedCore/src/actionScripts/utils/UtilsCore.as
@@ -46,6 +46,7 @@ package actionScripts.utils
 	import actionScripts.plugin.ondiskproj.vo.OnDiskProjectVO;
 	import actionScripts.plugin.settings.SettingsView;
 	import actionScripts.ui.IContentWindow;
+	import actionScripts.ui.IFileContentWindow;
 	import actionScripts.ui.editor.BasicTextEditor;
 	import actionScripts.ui.menu.vo.MenuItem;
 	import actionScripts.ui.menu.vo.ProjectMenuTypes;
@@ -761,10 +762,10 @@ package actionScripts.utils
 
 			for (var i:int = 0; i < editorsCount; i++)
 			{
-				if ((model.editors[i] is BasicTextEditor) && model.editors[i].currentFile &&
-					(!projectReferencePath || model.editors[i].projectPath == projectReferencePath))
+				if ((model.editors[i] is IFileContentWindow) && model.editors[i].currentFile &&
+					(!projectReferencePath || (model.editors[i].hasOwnProperty("projectPath") && model.editors[i].projectPath == projectReferencePath)))
 				{
-                    var editor:BasicTextEditor = model.editors[i];
+                    var editor:IContentWindow = model.editors[i];
 					if (editor)
 					{
 						editorsToClose.push(editor);

diff --git a/ide/MoonshineSharedCore/src/components/views/project/TreeView.mxml b/ide/MoonshineSharedCore/src/components/views/project/TreeView.mxml
@@ -146,19 +146,18 @@
 			private function refreshFileFolder(fileWrapper:FileWrapper, project:ProjectVO = null):void
 			{
 				if(!project) project = UtilsCore.getProjectFromProjectFolder(fileWrapper);
-				var asProject:AS3ProjectVO = project as AS3ProjectVO;
 	
 				if(!ConstantsCoreVO.IS_AIR)
 				{
 					refreshProjectFromServer(fileWrapper, project);
 					return;
 				}
 	
-				if(asProject && asProject.isVisualEditorProject)
+				if((project is AS3ProjectVO) && (project as AS3ProjectVO).isVisualEditorProject)
 				{
 					dispatcher.dispatchEvent(
 							new RefreshVisualEditorSourcesEvent(RefreshVisualEditorSourcesEvent.REFRESH_VISUALEDITOR_SRC,
-									fileWrapper, asProject)
+									fileWrapper, (project as AS3ProjectVO))
 					);
 				} else if(fileWrapper)
 				{
@@ -391,8 +390,7 @@
 
 						model.selectedprojectFolders.addItemAt(project.projectFolder, 0);
 						
-						if (((project is AS3ProjectVO) && (project as AS3ProjectVO).isVisualEditorProject) || 
-							(project is OnDiskProjectVO))
+						if (((project is AS3ProjectVO) && (project as AS3ProjectVO).isVisualEditorProject))
 						{
 							refreshFileFolder(project.projectFolder, project);
 						}