4 files changed, 23 insertions, 9 deletions

diff --git a/js/clipboard/internal-ops/component-clipboard-agent.js b/js/clipboard/internal-ops/component-clipboard-agent.js
index 3dc41532..31b53474 100644
--- a/js/clipboard/internal-ops/component-clipboard-agent.js
+++ b/js/clipboard/internal-ops/component-clipboard-agent.js
@@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE.
 ////////////////////////////////////////////////////////////////////////
 //
 
-var Montage =                   require("montage/core/core").Montage,
-    Component =         require("montage/ui/component").Component;
+var Montage =               require("montage/core/core").Montage,
+    Component =     require("montage/ui/component").Component;
 
 var ComponentsClipboardAgent = exports.ComponentsClipboardAgent = Montage.create(Component, {
 
diff --git a/js/clipboard/internal-ops/css-clipboard-agent.js b/js/clipboard/internal-ops/css-clipboard-agent.js
index 42dd09c9..e93077a8 100644
--- a/js/clipboard/internal-ops/css-clipboard-agent.js
+++ b/js/clipboard/internal-ops/css-clipboard-agent.js
@@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE.
 ////////////////////////////////////////////////////////////////////////
 //
 
-var Montage =                   require("montage/core/core").Montage,
-    Component =         require("montage/ui/component").Component;
+var Montage =               require("montage/core/core").Montage,
+    Component =     require("montage/ui/component").Component;
 
 var CssClipboardAgent = exports.CssClipboardAgent = Montage.create(Component, {
 
diff --git a/js/clipboard/internal-ops/elements-clipboard-agent.js b/js/clipboard/internal-ops/elements-clipboard-agent.js
index 14984593..4f6e8195 100644
--- a/js/clipboard/internal-ops/elements-clipboard-agent.js
+++ b/js/clipboard/internal-ops/elements-clipboard-agent.js
@@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE.
 ////////////////////////////////////////////////////////////////////////
 //
 
-var Montage =                   require("montage/core/core").Montage,
-    Component =         require("montage/ui/component").Component,
+var Montage =               require("montage/core/core").Montage,
+    Component =     require("montage/ui/component").Component,
     ClipboardUtil = require("js/clipboard/util").ClipboardUtil,
     World =         require("js/lib/drawing/world").World;
 
@@ -267,7 +267,10 @@ var ElementsClipboardAgent = exports.ElementsClipboardAgent = Montage.create(Com
                 styles = null;
             }
 
+            var addDelegate = this.application.ninja.elementMediator.addDelegate;
+            this.application.ninja.elementMediator.addDelegate = null;
             this.application.ninja.elementMediator.addElements(canvas, styles, false);
+            this.application.ninja.elementMediator.addDelegate = addDelegate;
 
             worldData = sourceCanvas.elementModel.shapeModel ? sourceCanvas.elementModel.shapeModel.GLWorld.exportJSON(): null;
             if(worldData)
@@ -349,7 +352,7 @@ var ElementsClipboardAgent = exports.ElementsClipboardAgent = Montage.create(Com
 
     pastePositioned:{
         value: function(element, styles, fromCopy){// for now can wok for both in-place and centered paste
-            var modObject = [], x,y, newX, newY, counter;
+            var modObject = [], x,y, newX, newY, counter, self = this;
 
             if((typeof fromCopy === "undefined") || (fromCopy && fromCopy === true)){
                 counter = this.pasteCounter;
@@ -362,11 +365,22 @@ var ElementsClipboardAgent = exports.ElementsClipboardAgent = Montage.create(Com
             newX = styles ? ("" + (styles.left + (25 * counter)) + "px") : "100px";
             newY = styles ? ("" + (styles.top + (25 * counter)) + "px") : "100px";
 
+            var addDelegate = this.application.ninja.elementMediator.addDelegate;
+            this.application.ninja.elementMediator.addDelegate = null;
             if(!styles || (styles && !styles.position)){
                 this.application.ninja.elementMediator.addElements(element, null, false);
             }else if(styles && (styles.position === "absolute")){
+                if((element.tagName === "IMG") || (element.getAttribute("type") === "image/svg+xml")){
+                    element.onload = function(){
+                        element.onload = null;
+                        //refresh selection
+                        self.application.ninja.stage.needsDraw = true;
+                    }
+                }
+
                 this.application.ninja.elementMediator.addElements(element, {"top" : newY, "left" : newX}, false);//displace
             }
+            this.application.ninja.elementMediator.addDelegate = addDelegate;
         }
     },
 
diff --git a/js/clipboard/internal-ops/timeline-clipboard-agent.js b/js/clipboard/internal-ops/timeline-clipboard-agent.js
index d8ef7ae9..4e5cfe30 100644
--- a/js/clipboard/internal-ops/timeline-clipboard-agent.js
+++ b/js/clipboard/internal-ops/timeline-clipboard-agent.js
@@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE.
 ////////////////////////////////////////////////////////////////////////
 //
 
-var Montage =                   require("montage/core/core").Montage,
-    Component =         require("montage/ui/component").Component;
+var Montage =               require("montage/core/core").Montage,
+    Component =     require("montage/ui/component").Component;
 
 var TimelineClipboardAgent = exports.TimelineClipboardAgent = Montage.create(Component, {