Merge branch 'master' of github.com:Motorola-Mobility/ninja

2 files changed, 10 insertions, 21 deletions

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 9c9518a0..f5b574fc 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -49,7 +49,7 @@ exports.ElementMediator = Montage.create(Component, {
     },
 
     addElements:{
-        value:function (elements, rules, notify) {
+        value:function (elements, rules, notify, callAddDelegate) {
             if (Array.isArray(elements)) {
                 elements.forEach(function (element) {
                     ElementController.addElement(element, rules);
@@ -61,13 +61,15 @@ exports.ElementMediator = Montage.create(Component, {
 
             }
 
-            if (this.addDelegate && typeof (this.addDelegate['onAddElements']) === "function") {
+            if ((callAddDelegate || (typeof callAddDelegate === "undefined"))
+                && this.addDelegate && typeof (this.addDelegate['onAddElements']) === "function") {
+
                 this.addDelegate['onAddElements'].call(this.addDelegate, elements);
             }
 
             var undoLabel = "add element";
 
-            document.application.undoManager.add(undoLabel, this.removeElements, this, elements, notify);
+            document.application.undoManager.add(undoLabel, this.removeElements, this, elements, notify, false);
 
             this.application.ninja.currentDocument.model.needsSave = true;
 
@@ -78,9 +80,10 @@ exports.ElementMediator = Montage.create(Component, {
     },
 
     removeElements:{
-        value:function (elements, notify /* Used for the add undo */) {
+        value:function (elements, notify, callDeleteDelegate) {
 
-            if (this.deleteDelegate && (typeof this.deleteDelegate.handleDelete === 'function')) {
+            if ((callDeleteDelegate || (typeof callDeleteDelegate === "undefined"))
+                && this.deleteDelegate && (typeof this.deleteDelegate.handleDelete === 'function')) {
                 return this.deleteDelegate.handleDelete();
                 // this.handleDelete.call(deleteDelegate);
             }
@@ -96,7 +99,7 @@ exports.ElementMediator = Montage.create(Component, {
 
             var undoLabel = "add element";
 
-            document.application.undoManager.add(undoLabel, this.addElements, this, elements, null, notify);
+            document.application.undoManager.add(undoLabel, this.addElements, this, elements, null, notify, false);
 
             this.application.ninja.currentDocument.model.needsSave = true;
 
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 36bc86fd..a323b9c3 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -98,20 +98,6 @@ exports.KeyboardMediator = Montage.create(Component, {
         value: function() {
             document.addEventListener("keydown", this, false);
             document.addEventListener("keyup", this, false);
-
-            this.addPropertyChangeListener("appModel.livePreview", this.handleLivePreview, false);
-        }
-    },
-
-    handleLivePreview: {
-        value: function() {
-            if(this.appModel.livePreview) {
-                document.removeEventListener("keydown", this, false);
-                document.removeEventListener("keyup", this, false);
-            } else {
-                document.addEventListener("keydown", this, false);
-                document.addEventListener("keyup", this, false);
-            }
         }
     },
 
@@ -264,7 +250,7 @@ exports.KeyboardMediator = Montage.create(Component, {
 
 
                 if((evt.keyCode == Keyboard.ENTER) && (evt.ctrlKey || evt.metaKey)) {
-                    this.application.ninja.executeChromePreview();
+                    this.application.ninja.handleExecutePreview();
                     return;
                 }