aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
diff options
context:
space:
mode:
authorJonathan Duran2012-07-20 08:30:24 -0700
committerJonathan Duran2012-07-20 08:30:24 -0700
commit936fbd6d76d35e3f9574983682c266de6dce55f7 (patch)
treeedfbd366df9d7e7514425561a817fc2c67f398d9 /js/mediators
parent7b7f4157dfd1d3ad2b4a266c92594da56a619254 (diff)
parent9053e2037821a5c8405fabb74db9635deacfe8d5 (diff)
downloadninja-936fbd6d76d35e3f9574983682c266de6dce55f7.tar.gz
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/mediators')
-rwxr-xr-xjs/mediators/keyboard-mediator.js14
1 files changed, 0 insertions, 14 deletions
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index f71356b6..a323b9c3 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -98,20 +98,6 @@ exports.KeyboardMediator = Montage.create(Component, {
98 value: function() { 98 value: function() {
99 document.addEventListener("keydown", this, false); 99 document.addEventListener("keydown", this, false);
100 document.addEventListener("keyup", this, false); 100 document.addEventListener("keyup", this, false);
101
102 this.addPropertyChangeListener("appModel.livePreview", this.handleLivePreview, false);
103 }
104 },
105
106 handleLivePreview: {
107 value: function() {
108 if(this.appModel.livePreview) {
109 document.removeEventListener("keydown", this, false);
110 document.removeEventListener("keyup", this, false);
111 } else {
112 document.addEventListener("keydown", this, false);
113 document.addEventListener("keyup", this, false);
114 }
115 } 101 }
116 }, 102 },
117 103