Merge branch 'refs/heads/Ninja-Master' into Document

1 files changed, 22 insertions, 1 deletions

diff --git a/js/controllers/clipboard-controller.js b/js/controllers/clipboard-controller.js
index d2173e31..c3543c95 100644
--- a/js/controllers/clipboard-controller.js
+++ b/js/controllers/clipboard-controller.js
@@ -80,8 +80,15 @@ 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") {
+                if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") {
+                    return;
+                }
+            }
+
+            //perform clipboard operations only if selection tool is selected
+            if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){
                 return;
             }
 
@@ -99,6 +106,13 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
 
             // Don't do anything if an input or other control is focused
             if(document.activeElement.nodeName !== "BODY") {
+                if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") {
+                    return;
+                }
+            }
+
+            //perform clipboard operations only if selection tool is selected
+            if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){
                 return;
             }
 
@@ -123,6 +137,13 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
 
             // Don't do anything if an input or other control is focused
             if(document.activeElement.nodeName !== "BODY") {
+                if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") {
+                    return;
+                }
+            }
+
+            //perform clipboard operations only if selection tool is selected
+            if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){
                 return;
             }