diff options
| author | Eric Guzman | 2012-03-29 16:29:04 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-29 16:29:04 -0700 |
| commit | ccd57d8610a7839cf14b2c9e354b64acf53093a7 (patch) | |
| tree | f11b4418483fd21831b72ca6dc0451422a25bfe2 /js/mediators | |
| parent | 7aefa059c79c9bef5c7a8a93cdfbd1ce55f69118 (diff) | |
| parent | f4949cab544886702e7ad6eeaa6215125c7b067a (diff) | |
| download | ninja-ccd57d8610a7839cf14b2c9e354b64acf53093a7.tar.gz | |
Merge branch 'refs/heads/master' into PresetsPI
Diffstat (limited to 'js/mediators')
| -rwxr-xr-x | js/mediators/keyboard-mediator.js | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js index 65dd34cd..fc0d0f6a 100755 --- a/js/mediators/keyboard-mediator.js +++ b/js/mediators/keyboard-mediator.js | |||
| @@ -245,8 +245,6 @@ exports.KeyboardMediator = Montage.create(Component, { | |||
| 245 | //menuViewManagerModule.MenuViewManager.closeMenu("mainMenuBar"); | 245 | //menuViewManagerModule.MenuViewManager.closeMenu("mainMenuBar"); |
| 246 | return; | 246 | return; |
| 247 | } | 247 | } |
| 248 | |||
| 249 | |||
| 250 | } | 248 | } |
| 251 | }, | 249 | }, |
| 252 | 250 | ||