diff options
| author | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
| commit | c21db7f1e4a0582777bdb5366df5d023a915b779 (patch) | |
| tree | c4d29cb4686101d4a480ae836d20187879cf5400 /js/mediators/keyboard-mediator.js | |
| parent | 3ed95247e9ea4b0a7833401ed6809647b7c4acbf (diff) | |
| parent | 1a7e347810401e6262d9d7bad1c3583e6773993b (diff) | |
| download | ninja-c21db7f1e4a0582777bdb5366df5d023a915b779.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/data/panels-data.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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") { |