Merge pull request #428 from hwshim/master

[BUGFIX] Showing global menu for workspace
webida · Sep 11, 2015 · 23d8e6d · 23d8e6d
2 parents d33b576 + f6860fb
commit 23d8e6d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
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, deferred) {
+        getMenuItemsUnderEdit: function(items, menuItems) {
             var editor = this.editor;
 
             if (editor) {
@@ -1526,12 +1526,9 @@ define([
                 sourceItems['&Fold'] = menuItems.editMenuItems['&Source']['&Fold'];
 
                 items['&Source'] = sourceItems;
-
-                deferred.resolve(items);
-
-            } else {
-                deferred.resolve(items);
             }
+
+            return items;
         },
 
         /**

diff --git a/common/src/webida/plugins/editors/viable-menu-items.js b/common/src/webida/plugins/editors/viable-menu-items.js
@@ -48,6 +48,7 @@ define([
 
     function getItemsUnderFile() {
         logger.info('getItemsUnderFile()');
+        logger.trace();
         var items = {};
         var registry = _getPartRegistry();
         var currentPart = registry.getCurrentEditorPart();
@@ -78,16 +79,15 @@ define([
 
     function getItemsUnderEdit() {
         logger.info('getItemsUnderEdit()');
-        var deferred = new Deferred();
         var items = {};
         var part = _getCurrentEditorPart();
         if (part) {
             var viewer = part.getViewer();
             if (viewer) {
-                viewer.getMenuItemsUnderEdit(items, menuItems, deferred);
+                items = viewer.getMenuItemsUnderEdit(items, menuItems);
             }
         }
-        return deferred;
+        return items;
     }
 
     function getItemsUnderFind() {