2 files changed, 26 insertions, 33 deletions

diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index a7d99466..ea5fe4af 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -11,17 +11,16 @@ exports.ElementController = Montage.create(Component, {
 
     addElement: {
         value: function(el, styles) {
-            if(this.application.ninja.timeline.currentLayerSelected){
+            if(this.application.ninja.timeline.currentLayerSelected) {
                 var selectedLayerIndex = this.application.ninja.timeline.getLayerIndexByID(this.application.ninja.timeline.currentLayerSelected.layerData.layerID);
 
-                if(selectedLayerIndex==0){
+                if(selectedLayerIndex === 0) {
                     this.application.ninja.currentDocument.documentRoot.appendChild(el);
-                }else{
-                    var  element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.elementsList[0];
-                    element.parentNode.insertBefore(el,element.nextSibling);
+                } else {
+                    var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.elementsList[0];
+                    element.parentNode.insertBefore(el, element.nextSibling);
                 }
-
-            }else{
+            } else {
                 this.application.ninja.currentDocument.documentRoot.appendChild(el);
             }
             // Nested elements - TODO make sure the CSS is correct before nesting elements
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 49a8e369..06514076 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -517,36 +517,30 @@ exports.ElementMediator = Montage.create(Component, {
     },
 
     reArrangeDOM:{
-            value:function(layersDraggedArray  , layerDroppedAfter){
+        value: function(layersDraggedArray, layerDroppedAfter) {
+            var documentRoot,length;
 
-                var documentRoot,length;
+            documentRoot = this.application.ninja.currentDocument.documentRoot;
+            length = layersDraggedArray.length;
 
-                documentRoot = this.application.ninja.currentDocument.documentRoot;
-                length = layersDraggedArray.length;
-
-                for(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++;
-    //                        }
-    //                    }
+            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