Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

4 files changed, 93 insertions, 751 deletions

diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index 59086ef6..14bdb0eb 100755
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -115,12 +115,10 @@ exports.DragDropMediator = Montage.create(Component, {
                                                 //
                                                 if (e.currentTarget.fileType.indexOf('svg') !== -1) {
                                                         element = NJUtils.make('embed', null, this.application.ninja.currentDocument);//TODO: Verify this is proper
-                                NJUtils.createModelWithSelection(element, "SVG");
                                                         element.type = 'image/svg+xml';
                                         element.src = url+'/'+fileName;
                                                 } else {
                                                         element = NJUtils.make('image', null, this.application.ninja.currentDocument);
-                                NJUtils.createModel(element);
                                         element.src = url+'/'+fileName;
                                                 }
                                                 //Adding element once it is loaded
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 1d5e9ade..40e94cca 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -29,16 +29,13 @@ exports.ElementMediator = Montage.create(Component, {
             if(Array.isArray(elements)) {
                 elements.forEach(function(element) {
                     ElementController.addElement(element, rules);
-                    if(element.elementModel && element.elementModel.props3D) {
                         element.elementModel.props3D.init(element, false);
-                    }
                 });
             } else {
                 ElementController.addElement(elements, rules);
-                if(elements.elementModel && elements.elementModel.props3D) {
                     elements.elementModel.props3D.init(elements, false);
+
                 }
-            }
 
             if(this.addDelegate && typeof (this.addDelegate['onAddElements']) === "function") {
                 this.addDelegate['onAddElements'].call(this.addDelegate, elements);
@@ -102,11 +99,6 @@ exports.ElementMediator = Montage.create(Component, {
 
     getProperty: {
         value: function(el, prop, valueMutator) {
-            if(!el.elementModel) {
-                console.log("Element has no Model -> One should have been created");
-                NJUtils.makeElementModel(el, "Div", "block");
-            }
-
             if(valueMutator && typeof valueMutator === "function") {
                 return valueMutator(el.elementModel.controller["getProperty"](el, prop));
             } else {
@@ -117,22 +109,12 @@ exports.ElementMediator = Montage.create(Component, {
 
     getShapeProperty: {
         value: function(el, prop) {
-            if(!el.elementModel) {
-                console.log("Element has no Model -> One should have been created");
-                NJUtils.makeElementModel(el, "Canvas", "block", true);
-            }
-
             return el.elementModel.controller["getShapeProperty"](el, prop);
         }
     },
 
     setShapeProperty: {
         value: function(el, prop, value) {
-            if(!el.elementModel) {
-                console.log("Element has no Model -> One should have been created");
-                NJUtils.makeElementModel(el, "Canvas", "block", true);
-            }
-
             return el.elementModel.controller["setShapeProperty"](el, prop, value);
         }
     },
@@ -297,9 +279,6 @@ exports.ElementMediator = Montage.create(Component, {
     // Routines to get/set color
     getColor: {
         value: function(el, isFill, borderSide) {
-            if(!el.elementModel) {
-                NJUtils.makeModelFromElement(el);
-            }
             return el.elementModel.controller["getColor"](el, isFill, borderSide);
         }
     },
@@ -373,78 +352,76 @@ exports.ElementMediator = Montage.create(Component, {
     },
 
     getStroke: {
-        value: function(el) {
-            if(!el.elementModel) {
-                NJUtils.makeElementModel(el, "Div", "block");
-            }
-            return el.elementModel.controller["getStroke"](el);
+        value: function(el, strokeProperties) {
+            return el.elementModel.controller["getStroke"](el, strokeProperties);
         }
     },
 
-
     /**
-     Set a property change command for an element or array of elements
+     Set stroke/border properties on an element or array of elements
      @param els: Array of elements. Can contain 1 or more elements
      @param value: Value to be set. This is the stroke info
      @param eventType: Change/Changing. Will be passed to the dispatched event
      @param source: String for the source object making the call
      @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
      */
     setStroke: {
         value: function(els, value, eventType, source, currentValue) {
 
-            if(eventType === "Changing") {
-                this._setStroke(els, value, isFill, eventType, source);
-            } else {
+            if(eventType !== "Changing") {
                 // Calculate currentValue if not found for each element
                 if(!currentValue) {
-                    var that = this;
+                    var that = this,
+                        val = value;
                     currentValue = els.map(function(item) {
-                        return that.getStroke(item);
+                        return that.getStroke(item, val);
                     });
                 }
+                document.application.undoManager.add("Set stroke", this.setStroke, this, els, currentValue, eventType, source, value);
+            }
 
-                var command = Montage.create(Command, {
-                    _els:               { value: els },
-                    _value:             { value: value },
-                    _previous:          { value: currentValue },
-                    _eventType:         { value: eventType},
-                    _source:            { value: "undo-redo"},
-                    description:        { value: "Set Color"},
-                    receiver:           { value: this},
-
-                    execute: {
-                        value: function(senderObject) {
-                            if(senderObject) this._source = senderObject;
-                            this.receiver._setStroke(this._els, this._value, this._eventType, this._source);
-                            this._source = "undo-redo";
-                            return "";
-                        }
-                    },
-
-                    unexecute: {
-                        value: function() {
-                            this.receiver._setStroke(this._els, this._previous, this._eventType, this._source);
-                            return "";
-                        }
-                    }
-                });
-
-                NJevent("sendToUndo", command);
-                command.execute(source);
+            for(var i=0, item; item = els[i]; i++) {
+                item.elementModel.controller["setStroke"](item, (value[i] || value), eventType, source);
             }
 
+            NJevent("element" + eventType, {type : "setStroke", source: source, data: {"els": els, "prop": "stroke", "value": value}, redraw: null});
         }
     },
 
-    _setStroke: {
-        value: function(els, value, eventType, source) {
+    getFill: {
+        value: function(el, fillProperties) {
+            return el.elementModel.controller["getFill"](el, fillProperties);
+        }
+    },
+
+    /**
+     Set fill/background properties for an element or array of elements
+     @param els: Array of elements. Can contain 1 or more elements
+     @param value: Value to be set. This is the fill info
+     @param eventType: Change/Changing. Will be passed to the dispatched event
+     @param source: String for the source object making the call
+     @param currentValue *OPTIONAL*: current value array. If not found the current value is calculated
+     */
+    setFill: {
+        value: function(els, value, eventType, source, currentValue) {
+
+            if(eventType !== "Changing") {
+                // Calculate currentValue if not found for each element
+                if(!c