aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-17 23:47:39 -0700
committerValerio Virgillito2012-07-17 23:47:39 -0700
commit0cef3e553689005cb3a12b43bee26ecf75d9ad61 (patch)
treef0a1c6471cc5f5f07a7aa98bfac942f0c89d1fc1
parentb9afa81d391f51ea199fc12278b89bdda883dd97 (diff)
parent8f78cb1377009dabde95f4a81d5090b79b9de0da (diff)
downloadninja-0cef3e553689005cb3a12b43bee26ecf75d9ad61.tar.gz
Merge branch 'menu-fixes' of github.com:mencio/ninja into menu-fixes
Conflicts: js/ui/menu/menu-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
-rw-r--r--js/ui/menu/menu-controller.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/js/ui/menu/menu-controller.js b/js/ui/menu/menu-controller.js
index 3562a888..1bf8b8eb 100644
--- a/js/ui/menu/menu-controller.js
+++ b/js/ui/menu/menu-controller.js
@@ -113,6 +113,12 @@ exports.MenuController = Montage.create(Component, {
113 113
114 toggleItem: { 114 toggleItem: {
115 value: function(value) { 115 value: function(value) {
116<<<<<<< HEAD
117=======
118// var f = value.substr(0, value.indexOf("-"));
119// var c = value.slice(value.indexOf("-") + 1);
120
121>>>>>>> 8f78cb1377009dabde95f4a81d5090b79b9de0da
116 this['handle' + value.substr(0, value.indexOf("-"))](value.slice(value.indexOf("-") + 1)); 122 this['handle' + value.substr(0, value.indexOf("-"))](value.slice(value.indexOf("-") + 1));
117 } 123 }
118 }, 124 },