aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
diff options
context:
space:
mode:
authorhwc4872012-06-13 14:04:09 -0700
committerhwc4872012-06-13 14:04:09 -0700
commit3e481dd581e0305dd8b572ed0d17e86622223464 (patch)
treeaca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/mediators
parenta7aa51e6b91623772eef54b827616432838b560e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
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);