Merge pull request #429 from hwshim/master

[BUGFIX] Global menu for workspace and editors
webida · Sep 11, 2015 · 1940b9a · 1940b9a
2 parents 23d8e6d + b2d0ad3
commit 1940b9a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/apps/ide/src/plugins/webida.editor.code-editor/CodeEditorViewer.js b/apps/ide/src/plugins/webida.editor.code-editor/CodeEditorViewer.js
@@ -1480,10 +1480,10 @@ define([
                         deferred.resolve(items);
                     });
                 } else {
-                    deferred.resolve(items);
+                	deferred.resolve(items);
                 }
             } else {
-                deferred.resolve(items);
+            	deferred.resolve(items);
             }
         },
 

diff --git a/apps/ide/src/plugins/webida.editor.text-editor/TextEditorViewer.js b/apps/ide/src/plugins/webida.editor.text-editor/TextEditorViewer.js
@@ -1477,7 +1477,7 @@ define([
             }
         },
 
-        getMenuItemsUnderEdit: function(items, menuItems) {
+        getMenuItemsUnderEdit: function(items, menuItems, deferred) {
             var editor = this.editor;
 
             if (editor) {
@@ -1528,7 +1528,7 @@ define([
                 items['&Source'] = sourceItems;
             }
 
-            return items;
+			deferred.resolve(items);
         },
 
         /**

diff --git a/common/src/webida/plugins/editors/viable-menu-items.js b/common/src/webida/plugins/editors/viable-menu-items.js
@@ -80,14 +80,17 @@ define([
     function getItemsUnderEdit() {
         logger.info('getItemsUnderEdit()');
         var items = {};
+        var deferred = new Deferred();
         var part = _getCurrentEditorPart();
         if (part) {
             var viewer = part.getViewer();
             if (viewer) {
-                items = viewer.getMenuItemsUnderEdit(items, menuItems);
+                items = viewer.getMenuItemsUnderEdit(items, menuItems, deferred);
             }
+        } else {
+			deferred.resolve(items);
         }
-        return items;
+        return deferred;
     }
 
     function getItemsUnderFind() {
@@ -123,7 +126,6 @@ define([
         var naviEditorsItems = {};
         var itemsList = ['&Select Tab from List', '&Previous Tab', '&Next Tab', 'Move Tab to &Other Container', '&Ex-Selected Tab', 'Switch &Tab Container'];
 
-
         function getViewRunnableMenuItems(menuName) {
             var splitContainer = editors.splitViewContainer;
             var focusedVc = splitContainer.getFocusedViewContainer();
@@ -167,6 +169,7 @@ define([
             return false;
         }
 
+
         _.each(itemsList, function(item) {
             if (getViewRunnableMenuItems(item)) {
                 naviEditorsItems[item] = menuItems.navMenuItems['&Navigate Editors'][item];