aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-05 11:01:07 -0700
committerNivesh Rajbhandari2012-04-05 11:01:07 -0700
commitf38b97c6134242831e203f7036219aa2f7fad71e (patch)
tree0c0b1c580a59b859cfa3573ea2851693bf6e13d2
parentefb6c7563d87dcbeb6c34bd0c49ddb61d05e3689 (diff)
downloadninja-f38b97c6134242831e203f7036219aa2f7fad71e.tar.gz
Fixing curly brackets from auto-merge.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
-rwxr-xr-xjs/mediators/element-mediator.js22
1 files changed, 11 insertions, 11 deletions
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, {
37 var prop3d = this.get3DProperties(elements); 37 var prop3d = this.get3DProperties(elements);
38 if(prop3d) { 38 if(prop3d) {
39 elements.elementModel.controller["set3DProperties"](elements, [prop3d], 0, true); 39 elements.elementModel.controller["set3DProperties"](elements, [prop3d], 0, true);
40 } 40 }
41 } 41 }
42 42
43 if(this.addDelegate && typeof (this.addDelegate['onAddElements']) === "function") { 43 if(this.addDelegate && typeof (this.addDelegate['onAddElements']) === "function") {
44 this.addDelegate['onAddElements'].call(this.addDelegate, elements); 44 this.addDelegate['onAddElements'].call(this.addDelegate, elements);
45 } 45 }
46 46
47 var undoLabel = "add element"; 47 var undoLabel = "add element";
48 48
@@ -52,9 +52,9 @@ exports.ElementMediator = Montage.create(Component, {
52 52
53 if(notify || notify === undefined) { 53 if(notify || notify === undefined) {
54 NJevent("elementAdded", elements); 54 NJevent("elementAdded", elements);
55 } 55 }
56 } 56 }
57 }, 57 },
58 58
59 removeElements: { 59 removeElements: {
60 value: function(elements, notify /* Used for the add undo */) { 60 value: function(elements, notify /* Used for the add undo */) {
@@ -62,7 +62,7 @@ exports.ElementMediator = Montage.create(Component, {
62 if(this.deleteDelegate && (typeof this.deleteDelegate.handleDelete === 'function')) { 62 if(this.deleteDelegate && (typeof this.deleteDelegate.handleDelete === 'function')) {
63 return this.deleteDelegate.handleDelete(); 63 return this.deleteDelegate.handleDelete();
64 // this.handleDelete.call(deleteDelegate); 64 // this.handleDelete.call(deleteDelegate);
65 } 65 }
66 66
67 if(Array.isArray(elements)) { 67 if(Array.isArray(elements)) {
68 elements = Array.prototype.slice.call(elements, 0); 68 elements = Array.prototype.slice.call(elements, 0);
@@ -77,10 +77,10 @@ exports.ElementMediator = Montage.create(Component, {
77 77
78 document.application.undoManager.add(undoLabel, this.addElements, this, elements, null, notify); 78 document.application.undoManager.add(undoLabel, this.addElements, this, elements, null, notify);
79 79
80 this.application.ninja.documentController.activeDocument.needsSave = true; 80 this.application.ninja.documentController.activeDocument.needsSave = true;
81 81
82 NJevent("elementsRemoved", elements); 82 NJevent("elementsRemoved", elements);
83 } 83 }
84 }, 84 },
85 85
86 replaceElement: { 86 replaceElement: {
@@ -96,8 +96,8 @@ exports.ElementMediator = Montage.create(Component, {
96 96
97 if(notify || notify === undefined) { 97 if(notify || notify === undefined) {
98 NJevent("elementReplaced", {type : "replaceElement", data: {"newChild": newChild, "oldChild": oldChild}}); 98 NJevent("elementReplaced", {type : "replaceElement", data: {"newChild": newChild, "oldChild": oldChild}});
99 }
99 } 100 }
100 }
101 }, 101 },
102 102
103 getProperty: { 103 getProperty: {
@@ -620,8 +620,8 @@ exports.ElementMediator = Montage.create(Component, {
620 value: function(el) { 620 value: function(el) {
621 var str = this.getProperty(el, "-webkit-transform"); 621 var str = this.getProperty(el, "-webkit-transform");
622 return str && str.length; 622 return str && str.length;
623 } 623 }
624 } 624 }
625 625
626 626
627 627