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

2 files changed, 4 insertions, 23 deletions

diff --git a/js/clipboard/external-apps-clipboard-agent.js b/js/clipboard/external-apps-clipboard-agent.js
index 65410543..b82784d3 100644
--- a/js/clipboard/external-apps-clipboard-agent.js
+++ b/js/clipboard/external-apps-clipboard-agent.js
@@ -148,16 +148,12 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
             data = htmlData ? htmlData : textData;
 
             if (data && data.length) {
-                //deselect current selections
-                this.application.ninja.selectedElements.length = 0;
-                NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": true} );
-
                 divWrapper = document.application.njUtils.make("div", null, this.application.ninja.currentDocument);
                 this.application.ninja.elementMediator.addElements(divWrapper, {"height": "68px",
                                                                                 "left": "0px",
                                                                                 "position": "absolute",
                                                                                 "top": "0px",
-                                                                                "width": "161px"}, false);
+                                                                                "width": "161px"}, false/*notify*/, false/*callAddDelegate*/);
 
                 divWrapper.innerHTML = data;
 
diff --git a/js/controllers/clipboard-controller.js b/js/controllers/clipboard-controller.js
index c3543c95..3eba1bec 100644
--- a/js/controllers/clipboard-controller.js
+++ b/js/controllers/clipboard-controller.js
@@ -82,16 +82,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
 
             // 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") {
+                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;
-            }
-
             if(this.clipboardContext === "stage"){
                 ElementsClipboardAgent.copy(clipboardEvent);
             }
@@ -106,16 +101,11 @@ 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") {
+                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;
-            }
-
             if(this.clipboardContext === "stage"){
                 ElementsClipboardAgent.cut(clipboardEvent);
             }
@@ -137,16 +127,11 @@ 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") {
+                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;
-            }
-
             //TODO: return if stage is not focussed
 
             if(this.clipboardContext === "stage"){