From b2d0ad32d1d8cea7c55c1ccf3c4d3e86884f0541 Mon Sep 17 00:00:00 2001
From: Shim Heungwoon <hw.shim@samsung.com>
Date: Fri, 11 Sep 2015 17:51:05 +0900
Subject: [PATCH] [BUGFIX] Global menu for workspace and editors

---
 .../webida.editor.code-editor/CodeEditorViewer.js        | 4 ++--
 .../webida.editor.text-editor/TextEditorViewer.js        | 4 ++--
 common/src/webida/plugins/editors/viable-menu-items.js   | 9 ++++++---
 3 files changed, 10 insertions(+), 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
index a36eb825..809c89e2 100644
--- 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
index 277ae9bb..7c69d07b 100644
--- 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
index 9d8793e0..4a91f659 100644
--- 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];