2 files changed, 29 insertions, 5 deletions

diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index b0aba5b6..59086ef6 100755
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -114,11 +114,13 @@ exports.DragDropMediator = Montage.create(Component, {
                             var self = this;
                                                 //
                                                 if (e.currentTarget.fileType.indexOf('svg') !== -1) {
-                                                        element = NJUtils.makeNJElement('embed', 'SVG', 'block');//TODO: Verify this is proper
+                                                        element = NJUtils.make('embed', null, this.application.ninja.currentDocument);//TODO: Verify this is proper
+                                NJUtils.createModelWithSelection(element, "SVG");
                                                         element.type = 'image/svg+xml';
                                         element.src = url+'/'+fileName;
                                                 } else {
-                                                        element = NJUtils.makeNJElement('image', 'image', 'image');
+                                                        element = NJUtils.make('image', null, this.application.ninja.currentDocument);
+                                NJUtils.createModel(element);
                                         element.src = url+'/'+fileName;
                                                 }
                                                 //Adding element once it is loaded
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 2a85aea8..020f875f 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -520,11 +520,33 @@ exports.ElementMediator = Montage.create(Component, {
             var str = this.getProperty(el, "-webkit-transform");
             return str && str.length;
         }
-    }
-
+    },
 
+    reArrangeDOM:{
+        value: function(layersDraggedArray, layerDroppedAfter) {
+            var documentRoot,length;
 
+            documentRoot = this.application.ninja.currentDocument.documentRoot;
+            length = layersDraggedArray.length;
 
-    //--------------------------------------------------------------------------------------------------------
+            for(var i=0; documentRoot.children[i]; i++) {
+                if(documentRoot.children[i] === layerDroppedAfter.layerData.elementsList[0]) {
+                    if(length >0){
+                        documentRoot.children[i].parentNode.insertBefore(layersDraggedArray[length-1].layerData.elementsList[0], documentRoot.children[i]);
+                    }
 
+                    /* Will require for Multiple Drag n Drop */
+                    //length = length-1;
+                    //index = i;
+                    //if(length>0) {
+                        //while(layersDraggedArray[length]) {
+                            //documentRoot.children[index].parentNode.insertBefore(layersDraggedArray[length-1].layerData.elementsList[0],documentRoot.children[k].nextSibling);
+                            //length--;
+                            //index++;
+                        //}
+                    //}
+                }
+            }
+        }
+    }
 });
\ No newline at end of file