aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-13 14:03:00 -0700
committerJose Antonio Marquez2012-06-13 14:03:00 -0700
commitefbe5f83157a8dcbcc209c88877d9cd0113d4d20 (patch)
tree50565e097fe4a9db59e554af179f66938fa59f1c /js/mediators
parentae90152ae2889a10d44c22e1eeb5bff16cc44a19 (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-efbe5f83157a8dcbcc209c88877d9cd0113d4d20.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/mediators')
-rwxr-xr-xjs/mediators/keyboard-mediator.js5
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
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);