diff options
Diffstat (limited to 'js/clipboard/internal-ops/elements-clipboard-agent.js')
-rw-r--r-- | js/clipboard/internal-ops/elements-clipboard-agent.js | 42 |
1 files changed, 37 insertions, 5 deletions
diff --git a/js/clipboard/internal-ops/elements-clipboard-agent.js b/js/clipboard/internal-ops/elements-clipboard-agent.js index 1a4bfdba..d0ee5997 100644 --- a/js/clipboard/internal-ops/elements-clipboard-agent.js +++ b/js/clipboard/internal-ops/elements-clipboard-agent.js | |||
@@ -1,7 +1,31 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 2 | Copyright (c) 2012, Motorola Mobility, Inc |
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 3 | All Rights Reserved. |
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | BSD License. |
5 | |||
6 | Redistribution and use in source and binary forms, with or without | ||
7 | modification, are permitted provided that the following conditions are met: | ||
8 | |||
9 | - Redistributions of source code must retain the above copyright notice, | ||
10 | this list of conditions and the following disclaimer. | ||
11 | - Redistributions in binary form must reproduce the above copyright | ||
12 | notice, this list of conditions and the following disclaimer in the | ||
13 | documentation and/or other materials provided with the distribution. | ||
14 | - Neither the name of Motorola Mobility nor the names of its contributors | ||
15 | may be used to endorse or promote products derived from this software | ||
16 | without specific prior written permission. | ||
17 | |||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
25 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
26 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
27 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
28 | POSSIBILITY OF SUCH DAMAGE. | ||
5 | </copyright> */ | 29 | </copyright> */ |
6 | 30 | ||
7 | //////////////////////////////////////////////////////////////////////// | 31 | //////////////////////////////////////////////////////////////////////// |
@@ -325,7 +349,7 @@ var ElementsClipboardAgent = exports.ElementsClipboardAgent = Montage.create(Com | |||
325 | 349 | ||
326 | pastePositioned:{ | 350 | pastePositioned:{ |
327 | value: function(element, styles, fromCopy){// for now can wok for both in-place and centered paste | 351 | value: function(element, styles, fromCopy){// for now can wok for both in-place and centered paste |
328 | var modObject = [], x,y, newX, newY, counter; | 352 | var modObject = [], x,y, newX, newY, counter, self = this; |
329 | 353 | ||
330 | if((typeof fromCopy === "undefined") || (fromCopy && fromCopy === true)){ | 354 | if((typeof fromCopy === "undefined") || (fromCopy && fromCopy === true)){ |
331 | counter = this.pasteCounter; | 355 | counter = this.pasteCounter; |
@@ -341,6 +365,14 @@ var ElementsClipboardAgent = exports.ElementsClipboardAgent = Montage.create(Com | |||
341 | if(!styles || (styles && !styles.position)){ | 365 | if(!styles || (styles && !styles.position)){ |
342 | this.application.ninja.elementMediator.addElements(element, null, false); | 366 | this.application.ninja.elementMediator.addElements(element, null, false); |
343 | }else if(styles && (styles.position === "absolute")){ | 367 | }else if(styles && (styles.position === "absolute")){ |
368 | if((element.tagName === "IMG") || (element.getAttribute("type") === "image/svg+xml")){ | ||
369 | element.onload = function(){ | ||
370 | element.onload = null; | ||
371 | //refresh selection | ||
372 | self.application.ninja.stage.needsDraw = true; | ||
373 | } | ||
374 | } | ||
375 | |||
344 | this.application.ninja.elementMediator.addElements(element, {"top" : newY, "left" : newX}, false);//displace | 376 | this.application.ninja.elementMediator.addElements(element, {"top" : newY, "left" : newX}, false);//displace |
345 | } | 377 | } |
346 | } | 378 | } |
@@ -363,4 +395,4 @@ var ElementsClipboardAgent = exports.ElementsClipboardAgent = Montage.create(Com | |||
363 | } | 395 | } |
364 | 396 | ||
365 | 397 | ||
366 | }); \ No newline at end of file | 398 | }); |