aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-24 11:28:27 -0700
committerValerio Virgillito2012-05-24 11:28:27 -0700
commita8eb5c65a21af3bf8d8b8eb3e65b494b8bd9bc01 (patch)
treef6f2e044c646ea2749fafc29f1a1c3fabd2825ea /js/mediators
parent0ca1910df1c78116139664bf39a95cf0ec7c8dc8 (diff)
parentf801708f83aadfc688e69a244eb7cbaeca5d5e8d (diff)
downloadninja-a8eb5c65a21af3bf8d8b8eb3e65b494b8bd9bc01.tar.gz
Merge pull request #254 from mqg734/Dom-Architecture
Updates to stage code for handling multiple document workflow.
Diffstat (limited to 'js/mediators')
-rwxr-xr-xjs/mediators/keyboard-mediator.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 2f55edb4..e2e8e937 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.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") {
@@ -252,7 +252,7 @@ exports.KeyboardMediator = Montage.create(Component, {
252 handleKeyup: { 252 handleKeyup: {
253 value: function(evt) { 253 value: function(evt) {
254 //keyboard controls for html design view 254 //keyboard controls for html design view
255 if((!!this.application.ninja.currentDocument)){// && (this.application.ninja.currentDocument.model.currentView === "design")){ 255 if((!!this.application.ninja.currentDocument) && (this.application.ninja.currentDocument.currentView === "design")) {
256 if(document.activeElement.nodeName !== "BODY") { 256 if(document.activeElement.nodeName !== "BODY") {
257 // Don't do anything if an input or other control is focused 257 // Don't do anything if an input or other control is focused
258 return; 258 return;