11 files changed, 345 insertions, 530 deletions

diff --git a/js/controllers/elements/canvas-controller.js b/js/controllers/elements/canvas-controller.js
index b5df3911..7af7e824 100755
--- a/js/controllers/elements/canvas-controller.js
+++ b/js/controllers/elements/canvas-controller.js
@@ -33,13 +33,5 @@ exports.CanvasController = Montage.create(ElementController, {
                     ElementController.setProperty(el, p, value);
             }
         }
-    },
-        
-   setProperties: {
-       value: function(el, props, index) {
-           for(var p in props) {
-               el.elementModel.controller.setProperty(el, p, props[p][index]);
-           }
-       }
     }
 });
\ No newline at end of file
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 0f17dd46..35a543ac 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -48,16 +48,6 @@ exports.ElementController = Montage.create(Component, {
 
     setProperties: {
         value: function(element, properties) {
-            /* Array of properties is not supported yet
-            if(Array.isArray(properties)) {
-
-                elements.forEach(function(property) {
-                    this.application.ninja.stylesController.setElementStyle(element, p, props[p][index]);
-                });
-            } else {
-            }
-            */
-
             for(var property in properties) {
                 this.application.ninja.stylesController.setElementStyle(element, property, properties[property]);
         }
@@ -239,15 +229,16 @@ exports.ElementController = Montage.create(Component, {
 
     // TODO - perspective distance needs to be passed in as "dist" and matrix3d needs to be passed in as "mat"
     set3DProperties: {
-        value: function(el, props, index, update3DModel) {
-            var dist = props[index]["dist"],
-                mat = props[index]["mat"];
+        value: function(el, props, update3DModel) {
+            var dist = props["dist"],
+                mat = props["mat"];
+
             this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")");
 
             this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform-style", "preserve-3d");
 
             // TODO - We don't support perspective on individual elements yet
-//            this.application.ninja.stylesController.setElementStyle(el, "-webkit-perspective", dist);
+            // this.application.ninja.stylesController.setElementStyle(el, "-webkit-perspective", dist);
 
             el.elementModel.props3D.matrix3d = mat;
             el.elementModel.props3D.perspectiveDist = dist;
diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js
index f376e40f..3ef7dacc 100755
--- a/js/controllers/elements/stage-controller.js
+++ b/js/controllers/elements/stage-controller.js
@@ -31,46 +31,34 @@ exports.StageController = Montage.create(ElementController, {
         }
     },
 
+
     // TODO - perspective distance needs to be passed in as "dist" and matrix3d needs to be passed in as "mat"
     set3DProperties: {
-        value: function(el, props, index, update3DModel) {
-            var dist = props[index]["dist"],
-                mat = props[index]["mat"];
-            this.application.ninja.stylesController.setElementStyle(el,
-                                                                    "-webkit-transform",
-                                                                    "perspective(" + dist + ") " +
-                                                                    "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")",
-                                                                    true);
-
-            el.elementModel.props3D.matrix3d = mat;
-            el.elementModel.props3D.perspectiveDist = dist;
-
-            // TODO - Move this to matrix class
-            if(this._isRotated(mat))
-            {
-                this.application.ninja.currentDocument.stageBG.style.display = "none";
-            }
-            else
-            {
-                this.application.ninja.stylesController.setElementStyle(this.application.ninja.currentDocument.stageBG,
-                                                                        "-webkit-transform",
-                                                                        "perspective(" + dist + ") " +
-                                                                        "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")",
-                                                                        true);
-
-                this.application.ninja.currentDocument.stageBG.elementModel.props3D.matrix3d = mat;
-                this.application.ninja.currentDocument.stageBG.elementModel.props3D.perspectiveDist = dist;
-                this.application.ninja.currentDocument.stageBG.style.display = "block";
-            }
+            value: function(el, props, update3DModel) {
+                var dist = props["dist"], mat = props["mat"];
+                this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")", true);
+
+                el.elementModel.props3D.matrix3d = mat;
+                el.elementModel.props3D.perspectiveDist = dist;
 
-            this.application.ninja.stage.updatedStage = true;
+                // TODO - Move this to matrix class
+                if(this._isRotated(mat)) {
+                    this.application.ninja.currentDocument.stageBG.style.display = "none";
+                } else {
+                    this.application.ninja.stylesController.setElementStyle(this.application.ninja.currentDocument.stageBG, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")", true);
 
-            if(update3DModel)
-            {
-                this._update3DProperties(el, mat, dist);
+                    this.application.ninja.currentDocument.stageBG.elementModel.props3D.matrix3d = mat;
+                    this.application.ninja.currentDocument.stageBG.elementModel.props3D.perspectiveDist = dist;
+                    this.application.ninja.currentDocument.stageBG.style.display = "block";
+                }
+
+                this.application.ninja.stage.updatedStage = true;
+
+                if(update3DModel) {
+                    this._update3DProperties(el, mat, dist);
+                }
             }
-        }
-    },
+        },
 
     getProperty: {
         value: function(el, p) {
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 6ab33eff..a5f72462 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -234,8 +234,25 @@ exports.ElementMediator = Montage.create(Component, {
      @param eventType: Change/Changing. Will be passed to the dispatched event
      @param source: String for the source object making the call
      */
+        /*value: function(elements, properties, currentProperties, eventType, source) {*/
     setProperties: {
-        value: function(elements, properties, currentProperties, eventType, source) {
+        value: function(elements, eventType, source) {
+
+            elements.forEach(function(elementObject) {
+                elementObject.element.elementModel.controller["setProperties"](elementObject.element, elementObject.properties);
+            });
+
+            if(eventType !== "Changing") {
+                var undoLabel = "Properties change";
+                elements.forEach(function(elementObject) {
+                    var swap = elementObject.properties;
+                    elementObject.properties = elementObject.previousProperties;
+                    elementObject.previousProperties = swap;
+                });
+                document.application.undoManager.add(undoLabel, this.setProperties, this, elements, eventType, source);
+            }
+
+            /*
             // Assume elements is an array of elements always
             elements.forEach(function(element) {
                 element.elementModel.controller["setProperties"](element, properties);
@@ -246,79 +263,34 @@ exports.ElementMediator = Montage.create(Component, {
                 var undoLabel = "Properties change";
                 document.application.undoManager.add(undoLabel, this.setProperties, this, elements, currentProperties, properties, eventType, source);
             }
+            */
+            // Map the elements for the event data
+            var els = elements.map(function(element) {
+                return element.element;
+            });
 
             // Dispatch the element change/changing event.
-            NJevent("element" + eventType, {type : "setProperties", source: source, data: {"els": elements, "prop": properties, "value": properties}, redraw: null});
+            NJevent("element" + eventType, {type : "setProperties", source: source, data: {"els": els, "prop": elements[0].properties, "value": elements}, redraw: null});
         }
     },
 
-    /**
-     Set a property change command for an element or array of elements
-     @param els: Array of elements. Can contain 1 or more elements
-     @param props: Property/ies object containing both the value and property
-     @param eventType: Change/Changing. Will be passed to the dispatched event
-     @param source: String for the source object making the call
-     @param currentProps *OPTIONAL*: current properties objects array. If not found it will be calculated
-     @param stageRedraw: *OPTIONAL*: True. If set to false the stage will not redraw the selection/outline
-     */
     set3DProperties: {
-        value: function(els, props, eventType, source, currentProps, stageRedraw) {
-            if(eventType === "Changing") {
-                this._set3DProperties(els, props, eventType, source);
+        value: function(elements, eventType, source) {