diff options
| author | Nivesh Rajbhandari | 2012-05-23 16:09:45 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-05-23 16:09:45 -0700 |
| commit | d874b959bc297fed31d3ef3c2a7c8c77df88f761 (patch) | |
| tree | d36a0b464aed1f3ff91c81df3aaf52df72451472 /js/mediators/keyboard-mediator.js | |
| parent | f97590388467b5a3316f6f155162fc293915fddc (diff) | |
| parent | 0ca1910df1c78116139664bf39a95cf0ec7c8dc8 (diff) | |
| download | ninja-d874b959bc297fed31d3ef3c2a7c8c77df88f761.tar.gz | |
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Diffstat (limited to 'js/mediators/keyboard-mediator.js')
| -rwxr-xr-x | js/mediators/keyboard-mediator.js | 2 |
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") { |