aboutsummaryrefslogtreecommitdiff
path: root/js/ui
diff options
context:
space:
mode:
Diffstat (limited to 'js/ui')
-rw-r--r--js/ui/menu/menu-controller.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/js/ui/menu/menu-controller.js b/js/ui/menu/menu-controller.js
index 43e1b0b0..1bf8b8eb 100644
--- a/js/ui/menu/menu-controller.js
+++ b/js/ui/menu/menu-controller.js
@@ -113,9 +113,12 @@ exports.MenuController = Montage.create(Component, {
113 113
114 toggleItem: { 114 toggleItem: {
115 value: function(value) { 115 value: function(value) {
116<<<<<<< HEAD
117=======
116// var f = value.substr(0, value.indexOf("-")); 118// var f = value.substr(0, value.indexOf("-"));
117// var c = value.slice(value.indexOf("-") + 1); 119// var c = value.slice(value.indexOf("-") + 1);
118 120
121>>>>>>> 8f78cb1377009dabde95f4a81d5090b79b9de0da
119 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));
120 } 123 }
121 }, 124 },