aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-23 14:11:54 -0700
committerValerio Virgillito2012-05-23 14:11:54 -0700
commit6dfd2e7bb01ae4b60845fba858207364aef68f72 (patch)
tree511e1992e8a856ce2a5b108821c79c87f2a72058 /js/mediators
parent108764dbdaa0c040de9146c2d722b6e53830cd54 (diff)
parent26d4cbf0f5c65f60051273f1648a0e8005d8c78a (diff)
downloadninja-6dfd2e7bb01ae4b60845fba858207364aef68f72.tar.gz
Merge pull request #252 from ananyasen/dom-architecture
bug fixes
Diffstat (limited to 'js/mediators')
-rwxr-xr-xjs/mediators/keyboard-mediator.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 23a2ce75..2f55edb4 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -88,7 +88,7 @@ exports.KeyboardMediator = Montage.create(Component, {
88 88
89 //keyboard controls for html design view 89 //keyboard controls for html design view
90 // TODO - New template mode doesn't set currentView yet. 90 // TODO - New template mode doesn't set currentView yet.
91 if((!!this.application.ninja.currentDocument)){// && (this.application.ninja.currentDocument.model.currentView === "design")){ 91 if((!!this.application.ninja.currentDocument) && (this.application.ninja.currentDocument.model.currentView === "design")){
92 92
93 // Don't do anything if an input or other control is focused 93 // Don't do anything if an input or other control is focused
94 if(document.activeElement.nodeName !== "BODY") { 94 if(document.activeElement.nodeName !== "BODY") {