5 files changed, 635 insertions, 730 deletions

diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index 8663b06e..9d1b69a9 100755
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -111,6 +111,7 @@ exports.DragDropMediator = Montage.create(Component, {
                                                 fileName = tempName;
                                         }
                                         if (save && save.success && save.status === 201) {
+                            var self = this;
                                                 //
                                                 if (e.currentTarget.fileType.indexOf('svg') !== -1) {
                                                         element = NJUtils.makeNJElement('embed', 'SVG', 'block');//TODO: Verify this is proper
@@ -121,9 +122,10 @@ exports.DragDropMediator = Montage.create(Component, {
                                         element.src = url+'/'+fileName;
                                                 }
                                                 //TODO: Remove temp fix for elements to redraw on drop
+
                                                 element.onload = function () {
-                                                        NJevent("elementAdding", {el: element, data: rules});
-                                                }
+                                self.application.ninja.elementMediator.addElements(element, rules);
+                                                };
                                                 //
                                                 rules = {
                                                         'position': 'absolute',
@@ -133,7 +135,7 @@ exports.DragDropMediator = Montage.create(Component, {
                                         '-webkit-transform' : 'perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)'
                                         };
                                                 //
-                                NJevent("elementAdding", {el: element, data: rules});
+                            self.application.ninja.elementMediator.addElements(element, rules);
                                         } else {
                                                 //TODO: HANDLE ERROR ON SAVING FILE TO BE ADDED AS ELEMENT
                                         }
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 3182d5ec..3a9055e8 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -5,149 +5,100 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 </copyright> */
 
 var Montage = require("montage/core/core").Montage,
-    NJComponent = require("js/lib/nj-base").NJComponent;
+    Component = require("montage/ui/component").Component;
 
 var ElementController = require("js/controllers/elements/element-controller").ElementController,
     Command     =   require("js/controllers/undo-controller").Command,
-    GroupCommand = require("js/controllers/undo-controller").GroupCommand,
     NJUtils = require("js/lib/NJUtils").NJUtils;
 
-exports.ElementMediator = Montage.create(NJComponent, {
+exports.ElementMediator = Montage.create(Component, {
 
-    deleteDelegate: {
-        value: null
-    },
 
-    deserializedFromTemplate: {
-        value: function () {
-            this.eventManager.addEventListener("elementAdding", this, false);
-            this.eventManager.addEventListener("deleting", this, false);
-        }
+    addDelegate: {
+        enumerable: false,
+        value: null
     },
 
-    // TODO use the specific controller to be able to subclass the functionality
-    handleElementAdding: {
-        value: function(event) {
-            this.addElement(event.detail.el, event.detail.data);
-        }
+    deleteDelegate: {
+        enumerable: false,
+        value: null
     },
 
-    handleDeleting: {
-        value: function(event) {
-            if(this.deleteDelegate && (typeof this.deleteDelegate.handleDelete === 'function')) {
-                this.deleteDelegate.handleDelete();
+    addElements: {
+        value: function(elements, rules, notify) {
+            if(Array.isArray(elements)) {
+                elements.forEach(function(element) {
+                    element = element;
+                    ElementController.addElement(element, rules);
+                });
             } else {
-                // Add the Undo/Redo
-                var els = [],
-                    len = this.application.ninja.selectedElements.length;
+                ElementController.addElement(elements, rules);
 
-                if(len) {
-                    for(var i = 0; i<len; i++) {
-                        els.push(this.application.ninja.selectedElements[i]);
+                // TODO - Check with webgl branch - Props seem to be already there.
+                var prop3d = this.get3DProperties(elements);
+                if(prop3d) {
+                    elements.elementModel.controller["set3DProperties"](elements, [prop3d], 0, true);
                     }
-                    
-                    for(i=0; i<len; i++) {
-                        this._removeElement(els[i]._element);
                     }
 
-                    NJevent( "deleteSelection", els );
+            if(this.addDelegate && typeof (this.addDelegate['onAddElements']) === "function") {
+                this.addDelegate['onAddElements'].call(this.addDelegate, elements);
                 }
-            }
-        }
-    },
 
-    addElement: {
-        value: function(el, rules, noEvent) {
-            var command = Montage.create(Command, {
-                _el:            { value: el },
-                _rules:         { value: rules },
-                _noEvent:       { value: noEvent },
+            var undoLabel = "add element";
 
-                description: { value: "Adding Element"},
+            document.application.undoManager.add(undoLabel, this.removeElements, this, elements, notify);
 
-                receiver: { value: this},
+            this.application.ninja.documentController.activeDocument.needsSave = true;
 
-                execute: {
-                    value: function() {
-                        this.receiver._addElement(this._el, this._rules, this._noEvent);
-                        return this._el;
+            if(notify || notify === undefined) {
+                NJevent("elementAdded", elements);
                     }
+        }
                 },
 
-                unexecute: {
-                    value: function() {
-                        this.receiver._removeElement(this._el, this._rules, this._noEvent);
-                        return this._el;
-                    }
-                }
-            });
+    removeElements: {
+        value: function(elements, notify /* Used for the add undo */) {
 
-            NJevent("sendToUndo", command);
-            command.execute();
+            if(this.deleteDelegate && (typeof this.deleteDelegate.handleDelete === 'function')) {
+                return this.deleteDelegate.handleDelete();
+                // this.handleDelete.call(deleteDelegate);
         }
-    },
 
-    _addElement: {
-        value: function(el, rules, noEvent) {
-            ElementController.addElement(el, rules);
-            var p3d = this.get3DProperties(el);
-            if(p3d) {
-                el.elementModel.controller["set3DProperties"](el, [p3d], 0, true);
+            if(Array.isArray(elements)) {
+                elements = Array.prototype.slice.call(elements, 0);
+                elements.forEach(function(element) {
+                    ElementController.removeElement(element);
+                });
+            } else {
+                ElementController.removeElement(elements);
             }
-            if(!noEvent) {
+
+            var undoLabel = "add element";
+
+            document.application.undoManager.add(undoLabel, this.addElements, this, elements, null, notify);
+
                 this.application.ninja.documentController.activeDocument.needsSave = true;
-                NJevent("elementAdded", el);
+
+            NJevent("elementsRemoved", elements);
             }
-        }
     },
 
-    deleteElements: {
-         value: function(items) {
-            // Add the Undo/Redo
-            var len, el;
+    replaceElement: {
+        value: function(newChild, oldChild, notify) {
 
-            len = items.length;
+            this.application.ninja.currentDocument.documentRoot.replaceChild(newChild, oldChild);
 
-            if(len) {
+            var undoLabel = "replace element";
 
-                for(var i = len - 1; i >= 0; i--) {
-                    el = items[i]._element || items[i];
-                    this._removeElement(el);
-                }
+            document.application.undoManager.add(undoLabel, this.replaceElement, this, oldChild, newChild);
 
-                NJevent( "deleteSelection", items );
-            }