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

2 files changed, 6 insertions, 1 deletions

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 40e94cca..017ed20a 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -13,7 +13,6 @@ var ElementController = require("js/controllers/elements/element-controller").El
 
 exports.ElementMediator = Montage.create(Component, {
 
-
     addDelegate: {
         enumerable: false,
         value: null
@@ -84,6 +83,7 @@ exports.ElementMediator = Montage.create(Component, {
         value: function(newChild, oldChild, notify) {
 
             this.application.ninja.currentDocument.model.documentRoot.replaceChild(newChild, oldChild);
+            if (newChild.getAttribute) newChild.setAttribute('data-ninja-node', 'true');
 
             var undoLabel = "replace element";
 
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 73cea6de..27c3731c 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -56,6 +56,11 @@ var Keyboard = exports.Keyboard = {
 
 exports.KeyboardMediator = Montage.create(Component, {
 
+    appModel: {
+        value: null,
+        serializable: true
+    },
+
     deserializedFromTemplate: {
         value: function() {
             this.eventManager.addEventListener("appLoaded", this, false);