diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/mediators | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/mediators')
-rwxr-xr-x | js/mediators/keyboard-mediator.js | 5 |
1 files changed, 5 insertions, 0 deletions
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 | ||
57 | exports.KeyboardMediator = Montage.create(Component, { | 57 | exports.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); |