diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/mediators/keyboard-mediator.js | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-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/keyboard-mediator.js')
-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); |