Fixed some issues with the menu-fixes

- Fixed the dark background on file open
- Fixed the copy/paste/cut menu not working.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 10 insertions, 4 deletions

diff --git a/js/controllers/clipboard-controller.js b/js/controllers/clipboard-controller.js
index d2173e31..afc94c8c 100644
--- a/js/controllers/clipboard-controller.js
+++ b/js/controllers/clipboard-controller.js
@@ -80,9 +80,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
                 return;
             }//for design view only
 
-            // Don't do anything if an input or other control is focused
+            // Don't do anything if an input or other control is focused except the copy menu button
             if(document.activeElement.nodeName !== "BODY") {
-                return;
+                if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") {
+                    return;
+                }
             }
 
             if(this.clipboardContext === "stage"){
@@ -99,7 +101,9 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
 
             // Don't do anything if an input or other control is focused
             if(document.activeElement.nodeName !== "BODY") {
-                return;
+                if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") {
+                    return;
+                }
             }
 
             if(this.clipboardContext === "stage"){
@@ -123,7 +127,9 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
 
             // Don't do anything if an input or other control is focused
             if(document.activeElement.nodeName !== "BODY") {
-                return;
+                if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") {
+                    return;
+                }
             }
 
             //TODO: return if stage is not focussed