From 0b6e845b4afe8cf3571351bd7b2aa872fab61c71 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Thu, 19 Jul 2012 17:08:08 -0700 Subject: copy/paste from external apps - removed unnecessary selection change to fix PI redraw issue Signed-off-by: Ananya Sen Conflicts: js/controllers/clipboard-controller.js Signed-off-by: Ananya Sen --- js/clipboard/external-apps-clipboard-agent.js | 6 +----- js/controllers/clipboard-controller.js | 15 --------------- 2 files changed, 1 insertion(+), 20 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..afc94c8c 100644 --- a/js/controllers/clipboard-controller.js +++ b/js/controllers/clipboard-controller.js @@ -87,11 +87,6 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component } } - //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); } @@ -111,11 +106,6 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component } } - //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); } @@ -142,11 +132,6 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component } } - //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"){ -- cgit v1.2.3 From 0d414eaeae13bb520e52ddace0a83c03eb9e7769 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Fri, 20 Jul 2012 12:18:49 -0700 Subject: fixing logical error which was a side-effect of SHA:819348eaf3ff6b4a8c38ecca7c18f6dacac7f03b recently Signed-off-by: Ananya Sen --- js/controllers/clipboard-controller.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/controllers/clipboard-controller.js b/js/controllers/clipboard-controller.js index afc94c8c..3eba1bec 100644 --- a/js/controllers/clipboard-controller.js +++ b/js/controllers/clipboard-controller.js @@ -82,7 +82,7 @@ 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; } } @@ -101,7 +101,7 @@ 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; } } @@ -127,7 +127,7 @@ 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; } } -- cgit v1.2.3