aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
diff options
context:
space:
mode:
authorEric Guzman2012-06-19 01:20:36 -0700
committerEric Guzman2012-06-19 01:20:36 -0700
commit2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch)
treef69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/mediators
parent5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff)
parent1007cbf983ad0f2460a4122a492a96023fdb4439 (diff)
downloadninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts: js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/mediators')
-rwxr-xr-xjs/mediators/element-mediator.js1
-rwxr-xr-xjs/mediators/keyboard-mediator.js5
2 files changed, 6 insertions, 0 deletions
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 40e94cca..611cf214 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -84,6 +84,7 @@ exports.ElementMediator = Montage.create(Component, {
84 value: function(newChild, oldChild, notify) { 84 value: function(newChild, oldChild, notify) {
85 85
86 this.application.ninja.currentDocument.model.documentRoot.replaceChild(newChild, oldChild); 86 this.application.ninja.currentDocument.model.documentRoot.replaceChild(newChild, oldChild);
87 if (newChild.getAttribute) newChild.setAttribute('data-ninja-node', 'true');
87 88
88 var undoLabel = "replace element"; 89 var undoLabel = "replace element";
89 90
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 4fd4bd4c..196c8a4b 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -56,6 +56,11 @@ var Keyboard = exports.Keyboard = {
56 56
57exports.KeyboardMediator = Montage.create(Component, { 57exports.KeyboardMediator = Montage.create(Component, {
58 58
59 appModel: {
60 value: null,
61 serializable: true
62 },
63
59 deserializedFromTemplate: { 64 deserializedFromTemplate: {
60 value: function() { 65 value: function() {
61 this.eventManager.addEventListener("appLoaded", this, false); 66 this.eventManager.addEventListener("appLoaded", this, false);