diff options
| author | Pushkar Joshi | 2012-04-03 15:07:07 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-03 15:07:07 -0700 |
| commit | 12f988a32da12731ab35104128e396a6f388aeae (patch) | |
| tree | 1333043a3d5573f32bcaaf8df9955aef5e2e9720 /js/mediators | |
| parent | 79fb912bdaa22b8107bbddc93d1779820af80cf9 (diff) | |
| parent | c6de22bf42be90b403491b5f87b1818d9020310c (diff) | |
| download | ninja-12f988a32da12731ab35104128e396a6f388aeae.tar.gz | |
Merge branch 'master' into pentool
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 | ||