diff options
Diffstat (limited to 'js/ui/menu')
-rw-r--r-- | js/ui/menu/menu-controller.js | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/js/ui/menu/menu-controller.js b/js/ui/menu/menu-controller.js index 1bf8b8eb..3562a888 100644 --- a/js/ui/menu/menu-controller.js +++ b/js/ui/menu/menu-controller.js | |||
@@ -113,12 +113,6 @@ 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 | ||
122 | this['handle' + value.substr(0, value.indexOf("-"))](value.slice(value.indexOf("-") + 1)); | 116 | this['handle' + value.substr(0, value.indexOf("-"))](value.slice(value.indexOf("-") + 1)); |
123 | } | 117 | } |
124 | }, | 118 | }, |