aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorAnanya Sen2012-02-17 14:26:56 -0800
committerAnanya Sen2012-02-17 14:26:56 -0800
commit2980816130a44cd478b2a9d6606e021efbcebd4a (patch)
tree762d98ba8852b858c03760f4b9bef294fae6486c /js/data
parent96178309ddcdb54c0c451b69ea6fb8cdf76fcf62 (diff)
parenta42c536c2b3209afc058eabd31167bd0aa6f71c8 (diff)
downloadninja-2980816130a44cd478b2a9d6606e021efbcebd4a.tar.gz
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts: css/ninja.css js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/data')
-rwxr-xr-xjs/data/menu-data.js9
1 files changed, 9 insertions, 0 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 3a065958..6503e776 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -352,6 +352,15 @@ exports.MenuData = Montage.create( Montage, {
352 } 352 }
353 }, 353 },
354 { 354 {
355 "displayText" : "Presets",
356 "hasSubMenu" : false,
357 "enabled": true,
358 "checked": {
359 "value": true,
360 "boundProperty": "PresetsPanel"
361 }
362 },
363 {
355 "displayText" : "Code", 364 "displayText" : "Code",
356 "hasSubMenu" : false, 365 "hasSubMenu" : false,
357 "enabled": true 366 "enabled": true