diff options
author | Valerio Virgillito | 2012-07-09 17:04:31 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 17:04:31 -0700 |
commit | 2b2b5fbb4b6a786daa4e9d4ee9eba9ac78924842 (patch) | |
tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/clipboard/internal-ops | |
parent | cee0deca695359ab468bd06d0e05ed3b2010b338 (diff) | |
parent | 2eb84584f44b8c774479d1af2ee1d810597474cf (diff) | |
download | ninja-2b2b5fbb4b6a786daa4e9d4ee9eba9ac78924842.tar.gz |
Merge pull request #380 from ananyasen/codemirror-custom-theme-removal
Codemirror custom theme removal
Diffstat (limited to 'js/clipboard/internal-ops')
-rw-r--r-- | js/clipboard/internal-ops/elements-clipboard-agent.js | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/js/clipboard/internal-ops/elements-clipboard-agent.js b/js/clipboard/internal-ops/elements-clipboard-agent.js index 3129b644..a6bce2ba 100644 --- a/js/clipboard/internal-ops/elements-clipboard-agent.js +++ b/js/clipboard/internal-ops/elements-clipboard-agent.js | |||
@@ -142,7 +142,7 @@ var ElementsClipboardAgent = exports.ElementsClipboardAgent = Montage.create(Com | |||
142 | } | 142 | } |
143 | }, | 143 | }, |
144 | 144 | ||
145 | pasteFromCopy:{//todo: change to appropriate name | 145 | pasteFromCopy:{ |
146 | value:function(){ | 146 | value:function(){ |
147 | var i=0, j=0, | 147 | var i=0, j=0, |
148 | pastedElements = [],//array of te pastes clones - for selection | 148 | pastedElements = [],//array of te pastes clones - for selection |
@@ -152,7 +152,7 @@ var ElementsClipboardAgent = exports.ElementsClipboardAgent = Montage.create(Com | |||
152 | 152 | ||
153 | this.pasteCounter++; | 153 | this.pasteCounter++; |
154 | 154 | ||
155 | //TODO: cleanse HTML | 155 | //cleanse HTML |
156 | 156 | ||
157 | for(j=0; j< this.copiedObjects.copy.length; j++){ | 157 | for(j=0; j< this.copiedObjects.copy.length; j++){ |
158 | copiedElement = this.copiedObjects.copy[j]; | 158 | copiedElement = this.copiedObjects.copy[j]; |
@@ -230,9 +230,6 @@ var ElementsClipboardAgent = exports.ElementsClipboardAgent = Montage.create(Com | |||
230 | //build the computed style attribute | 230 | //build the computed style attribute |
231 | computedStyles = elem.ownerDocument.defaultView.getComputedStyle(elem); | 231 | computedStyles = elem.ownerDocument.defaultView.getComputedStyle(elem); |
232 | 232 | ||
233 | //todo: consider cleaning up the position data [or making position:relative with 0,0] from the computed styles, | ||
234 | // so that the object is pasted onto expernal applicaitons [like gmail] with no offset | ||
235 | |||
236 | for (i = 0; i < computedStyles.length; i++) { | 233 | for (i = 0; i < computedStyles.length; i++) { |
237 | stylePropertyName = computedStyles[i]; | 234 | stylePropertyName = computedStyles[i]; |
238 | computedStylesStr = computedStylesStr + stylePropertyName + ":" + computedStyles.getPropertyValue(stylePropertyName) + ";"; | 235 | computedStylesStr = computedStylesStr + stylePropertyName + ":" + computedStyles.getPropertyValue(stylePropertyName) + ";"; |