Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate

1 files changed, 9 insertions, 5 deletions

diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index cc384704..9d5dd256 100755
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -105,6 +105,10 @@ exports.DragDropMediator = Montage.create(Component, {
                                                         element = NJUtils.makeNJElement('embed', 'SVG', 'block');//TODO: Verify this is proper
                                         element.src = url+'/'+fileName;
                                         element.type = 'image/svg+xml';
+                                        //TODO: Remove temp fix for SVG redraw on drop
+                                                        element.onload = function () {
+                                                                NJevent("elementAdding", {el: element, data: rules});
+                                                        }
                                                 } else {
                                                         element = NJUtils.makeNJElement('image', 'image', 'image');
                                         element.src = url+'/'+fileName;
@@ -112,11 +116,11 @@ exports.DragDropMediator = Montage.create(Component, {
                                                 //
                                                 rules = {
                                                         'position': 'absolute',
-                                                        'top' : e.currentTarget.filePosition.y + 'px',
-                                                        'left' : e.currentTarget.filePosition.x + 'px'
-                                                        };
-                                        //
-                                                NJevent("elementAdding", {el: element, data: rules});
+                                                        'top' : (parseInt(e.currentTarget.filePosition.y) - parseInt(this.application.ninja.stage.userContentTop)) + 'px',
+                                                        'left' : (parseInt(e.currentTarget.filePosition.x) - parseInt(this.application.ninja.stage.userContentLeft)) + 'px'
+                                        };
+                                                //
+                                NJevent("elementAdding", {el: element, data: rules});
                                         } else {
                                                 //TODO: HANDLE ERROR ON SAVING FILE TO BE ADDED AS ELEMENT
                                         }