Merge branch 'refs/heads/master' into components

1 files changed, 5 insertions, 3 deletions

diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index 8663b06e..9d1b69a9 100755
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -111,6 +111,7 @@ exports.DragDropMediator = Montage.create(Component, {
                                                 fileName = tempName;
                                         }
                                         if (save && save.success && save.status === 201) {
+                            var self = this;
                                                 //
                                                 if (e.currentTarget.fileType.indexOf('svg') !== -1) {
                                                         element = NJUtils.makeNJElement('embed', 'SVG', 'block');//TODO: Verify this is proper
@@ -121,9 +122,10 @@ exports.DragDropMediator = Montage.create(Component, {
                                         element.src = url+'/'+fileName;
                                                 }
                                                 //TODO: Remove temp fix for elements to redraw on drop
+
                                                 element.onload = function () {
-                                                        NJevent("elementAdding", {el: element, data: rules});
-                                                }
+                                self.application.ninja.elementMediator.addElements(element, rules);
+                                                };
                                                 //
                                                 rules = {
                                                         'position': 'absolute',
@@ -133,7 +135,7 @@ exports.DragDropMediator = Montage.create(Component, {
                                         '-webkit-transform' : 'perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)'
                                         };
                                                 //
-                                NJevent("elementAdding", {el: element, data: rules});
+                            self.application.ninja.elementMediator.addElements(element, rules);
                                         } else {
                                                 //TODO: HANDLE ERROR ON SAVING FILE TO BE ADDED AS ELEMENT
                                         }