Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/lib/geom/geom-obj.js
	js/lib/geom/rectangle.js
	js/tools/TagTool.js

1 files changed, 25 insertions, 3 deletions

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