diff options
| author | Jonathan Duran | 2012-03-29 07:27:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-03-29 07:27:27 -0700 |
| commit | ab730848419a0b72c4c2747a3c928f2c8cc763e7 (patch) | |
| tree | 6b48b82604e194016ca048ad912f8015de719999 /js/mediators/keyboard-mediator.js | |
| parent | 06f247d881f4cfd790d635c6e310ae7f97724339 (diff) | |
| parent | 3fd2cdb59027b3f973b9165db9db4fdd22026941 (diff) | |
| download | ninja-ab730848419a0b72c4c2747a3c928f2c8cc763e7.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/mediators/keyboard-mediator.js')
| -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 | ||