Merge branch 'refs/heads/Ninja-Internal' into Color

2 files changed, 178 insertions, 175 deletions

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 017ed20a..ca7aadaf 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -1,42 +1,42 @@
 /* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
 
 var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component;
 
 var ElementController = require("js/controllers/elements/element-controller").ElementController,
-    Command     =   require("js/controllers/undo-controller").Command,
+    Command = require("js/controllers/undo-controller").Command,
     NJUtils = require("js/lib/NJUtils").NJUtils;
 
 exports.ElementMediator = Montage.create(Component, {
 
-    addDelegate: {
-        enumerable: false,
-        value: null
+    addDelegate:{
+        enumerable:false,
+        value:null
     },
 
-    deleteDelegate: {
-        enumerable: false,
-        value: null
+    deleteDelegate:{
+        enumerable:false,
+        value:null
     },
 
-    addElements: {
-        value: function(elements, rules, notify) {
-            if(Array.isArray(elements)) {
-                elements.forEach(function(element) {
+    addElements:{
+        value:function (elements, rules, notify) {
+            if (Array.isArray(elements)) {
+                elements.forEach(function (element) {
                     ElementController.addElement(element, rules);
-                        element.elementModel.props3D.init(element, false);
+                    element.elementModel.props3D.init(element, false);
                 });
             } else {
                 ElementController.addElement(elements, rules);
-                    elements.elementModel.props3D.init(elements, false);
+                elements.elementModel.props3D.init(elements, false);
 
-                }
+            }
 
-            if(this.addDelegate && typeof (this.addDelegate['onAddElements']) === "function") {
+            if (this.addDelegate && typeof (this.addDelegate['onAddElements']) === "function") {
                 this.addDelegate['onAddElements'].call(this.addDelegate, elements);
             }
 
@@ -46,23 +46,23 @@ exports.ElementMediator = Montage.create(Component, {
 
             this.application.ninja.currentDocument.model.needsSave = true;
 
-            if(notify || notify === undefined) {
+            if (notify || notify === undefined) {
                 NJevent("elementAdded", elements);
             }
         }
     },
 
-    removeElements: {
-        value: function(elements, notify /* Used for the add undo */) {
+    removeElements:{
+        value:function (elements, notify /* Used for the add undo */) {
 
-            if(this.deleteDelegate && (typeof this.deleteDelegate.handleDelete === 'function')) {
+            if (this.deleteDelegate && (typeof this.deleteDelegate.handleDelete === 'function')) {
                 return this.deleteDelegate.handleDelete();
                 // this.handleDelete.call(deleteDelegate);
             }
 
-            if(Array.isArray(elements)) {
+            if (Array.isArray(elements)) {
                 elements = Array.prototype.slice.call(elements, 0);
-                elements.forEach(function(element) {
+                elements.forEach(function (element) {
                     ElementController.removeElement(element);
                 });
             } else {
@@ -79,8 +79,8 @@ exports.ElementMediator = Montage.create(Component, {
         }
     },
 
-    replaceElement: {
-        value: function(newChild, oldChild, notify) {
+    replaceElement:{
+        value:function (newChild, oldChild, notify) {
 
             this.application.ninja.currentDocument.model.documentRoot.replaceChild(newChild, oldChild);
             if (newChild.getAttribute) newChild.setAttribute('data-ninja-node', 'true');
@@ -91,15 +91,15 @@ exports.ElementMediator = Montage.create(Component, {
 
             this.application.ninja.currentDocument.model.needsSave = true;
 
-            if(notify || notify === undefined) {
-                NJevent("elementReplaced", {type : "replaceElement", data: {"newChild": newChild, "oldChild": oldChild}});
+            if (notify || notify === undefined) {
+                NJevent("elementReplaced", {type:"replaceElement", data:{"newChild":newChild, "oldChild":oldChild}});
             }
         }
     },
 
-    getProperty: {
-        value: function(el, prop, valueMutator) {
-            if(valueMutator && typeof valueMutator === "function") {
+    getProperty:{
+        value:function (el, prop, valueMutator) {
+            if (valueMutator && typeof valueMutator === "function") {
                 return valueMutator(el.elementModel.controller["getProperty"](el, prop));
             } else {
                 return el.elementModel.controller["getProperty"](el, prop, valueMutator);
@@ -107,28 +107,28 @@ exports.ElementMediator = Montage.create(Component, {
         }
     },
 
-    getShapeProperty: {
-        value: function(el, prop) {
+    getShapeProperty:{
+        value:function (el, prop) {
             return el.elementModel.controller["getShapeProperty"](el, prop);
         }
     },
 
-    setShapeProperty: {
-        value: function(el, prop, value) {
+    setShapeProperty:{
+        value:function (el, prop, value) {
             return el.elementModel.controller["setShapeProperty"](el, prop, value);
         }
     },
 
     /**
-    Set a property change command for an element or array of elements
-    @param element: Element
-    @param attribute: Attribute to set
-    @param value: Value to be set.
-    @param currentValue: current value
-    @param source: String for the source object making the call
-    */
-    setAttribute: {
-        value: function(element, attribute, value, currentValue, source) {
+     Set a property change command for an element or array of elements
+     @param element: Element
+     @param attribute: Attribute to set
+     @param value: Value to be set.
+     @param currentValue: current value
+     @param source: String for the source object making the call
+     */
+    setAttribute:{
+        value:function (element, attribute, value, currentValue, source) {
             element.elementModel.controller["setAttribute"](element, attribute, value);
 
             // Add to the undo
@@ -149,40 +149,40 @@ exports.ElementMediator = Montage.create(Component, {
      @param currentValue *OPTIONAL*: current value array. If not found the current value is calculated
      @param stageRedraw: *OPTIONAL*: True. If set to false the stage will not redraw the selection/outline
      */
-    setProperty: {
-        value: function(els, p, value, eventType, source, currentValue) {
-            if(eventType === "Changing") {
+    setProperty:{
+        value:function (els, p, value, eventType, source, currentValue) {
+            if (eventType === "Changing") {
                 this._setProperty(els, p, value, eventType, source);
             } else {
                 // Calculate currentValue if not found for each element
-                if(!currentValue) {
+                if (!currentValue) {
                     var that = this;
-                    currentValue = els.map(function(item) {
+                    currentValue = els.map(function (item) {
                         return that.getProperty((item), p);
                     });
                 }
 
                 var command = Montage.create(Command, {
-                    _els:               { value: els },
-                    _p:                 { value: p },
-                    _value:             { value: value },
-                    _previous:          { value: currentValue },
-                    _eventType:         { value: eventType},
+                    _els:{ value:els },
+                    _p:{ value:p },
+                    _value:{ value:value },
+                    _previous:{ value:currentValue },
+                    _eventType:{ value:eventType},