diff options
author | Jonathan Duran | 2012-07-20 14:28:33 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-07-20 14:28:33 -0700 |
commit | c010ce7257df2545abb645318918c67e8e49251d (patch) | |
tree | 7528ec644389f89cf1d8684190f4545234cab1cd /js/clipboard | |
parent | 936fbd6d76d35e3f9574983682c266de6dce55f7 (diff) | |
parent | bf4bd611e6fadf45fa9dc50ad72902040075ff0c (diff) | |
download | ninja-c010ce7257df2545abb645318918c67e8e49251d.tar.gz |
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Diffstat (limited to 'js/clipboard')
-rw-r--r-- | js/clipboard/external-apps-clipboard-agent.js | 6 |
1 files changed, 1 insertions, 5 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 | |||
148 | data = htmlData ? htmlData : textData; | 148 | data = htmlData ? htmlData : textData; |
149 | 149 | ||
150 | if (data && data.length) { | 150 | if (data && data.length) { |
151 | //deselect current selections | ||
152 | this.application.ninja.selectedElements.length = 0; | ||
153 | NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": true} ); | ||
154 | |||
155 | divWrapper = document.application.njUtils.make("div", null, this.application.ninja.currentDocument); | 151 | divWrapper = document.application.njUtils.make("div", null, this.application.ninja.currentDocument); |
156 | this.application.ninja.elementMediator.addElements(divWrapper, {"height": "68px", | 152 | this.application.ninja.elementMediator.addElements(divWrapper, {"height": "68px", |
157 | "left": "0px", | 153 | "left": "0px", |
158 | "position": "absolute", | 154 | "position": "absolute", |
159 | "top": "0px", | 155 | "top": "0px", |
160 | "width": "161px"}, false); | 156 | "width": "161px"}, false/*notify*/, false/*callAddDelegate*/); |
161 | 157 | ||
162 | divWrapper.innerHTML = data; | 158 | divWrapper.innerHTML = data; |
163 | 159 | ||