From f38b97c6134242831e203f7036219aa2f7fad71e Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 5 Apr 2012 11:01:07 -0700
Subject: Fixing curly brackets from auto-merge.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/mediators/element-mediator.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'js/mediators/element-mediator.js')

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index a26fba79..c153101e 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -37,12 +37,12 @@ exports.ElementMediator = Montage.create(Component, {
                 var prop3d = this.get3DProperties(elements);
                 if(prop3d) {
                     elements.elementModel.controller["set3DProperties"](elements, [prop3d], 0, true);
-                    }
-                    }
+                }
+            }
 
             if(this.addDelegate && typeof (this.addDelegate['onAddElements']) === "function") {
                 this.addDelegate['onAddElements'].call(this.addDelegate, elements);
-                }
+            }
 
             var undoLabel = "add element";
 
@@ -52,9 +52,9 @@ exports.ElementMediator = Montage.create(Component, {
 
             if(notify || notify === undefined) {
                 NJevent("elementAdded", elements);
-                    }
+            }
         }
-                },
+    },
 
     removeElements: {
         value: function(elements, notify /* Used for the add undo */) {
@@ -62,7 +62,7 @@ exports.ElementMediator = Montage.create(Component, {
             if(this.deleteDelegate && (typeof this.deleteDelegate.handleDelete === 'function')) {
                 return this.deleteDelegate.handleDelete();
                 // this.handleDelete.call(deleteDelegate);
-        }
+            }
 
             if(Array.isArray(elements)) {
                 elements = Array.prototype.slice.call(elements, 0);
@@ -77,10 +77,10 @@ exports.ElementMediator = Montage.create(Component, {
 
             document.application.undoManager.add(undoLabel, this.addElements, this, elements, null, notify);
 
-                this.application.ninja.documentController.activeDocument.needsSave = true;
+            this.application.ninja.documentController.activeDocument.needsSave = true;
 
             NJevent("elementsRemoved", elements);
-            }
+        }
     },
 
     replaceElement: {
@@ -96,8 +96,8 @@ exports.ElementMediator = Montage.create(Component, {
 
             if(notify || notify === undefined) {
                 NJevent("elementReplaced", {type : "replaceElement", data: {"newChild": newChild, "oldChild": oldChild}});
+            }
         }
-                }
     },
 
     getProperty: {
@@ -620,8 +620,8 @@ exports.ElementMediator = Montage.create(Component, {
         value: function(el) {
             var str = this.getProperty(el, "-webkit-transform");
             return str && str.length;
-            }
-            }
+        }
+    }
 
 
 
-- 
cgit v1.2.3