aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-28 11:56:54 -0700
committerValerio Virgillito2012-03-28 11:56:54 -0700
commit3fd2cdb59027b3f973b9165db9db4fdd22026941 (patch)
tree88c96e3f87729a873af7fc88379f4935e83306ed /js/mediators
parenta25e50a429dfa87522ed7616dcae7b472f3c785c (diff)
parent3571253acb831860d4bc12466b663655bdac652e (diff)
downloadninja-3fd2cdb59027b3f973b9165db9db4fdd22026941.tar.gz
Merge pull request #131 from ananyasen/integration-candidate
Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266
Diffstat (limited to 'js/mediators')
-rwxr-xr-xjs/mediators/keyboard-mediator.js2
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