diff options
author | Ananya Sen | 2012-02-18 18:49:45 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-18 18:49:45 -0800 |
commit | 8fdce771bfcf662cf1acc16d45e4361ffd06c53e (patch) | |
tree | 4ac283e0e7724e5ede21c1a1e97d121033578c72 /js/data | |
parent | c2a5918480adae0124e1dc2531c019562f1e3e60 (diff) | |
parent | e23708721a71ca4c71365f5f8e8ac7d6113926db (diff) | |
download | ninja-8fdce771bfcf662cf1acc16d45e4361ffd06c53e.tar.gz |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/data')
-rwxr-xr-x | js/data/menu-data.js | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js index 6503e776..7c3ca5d4 100755 --- a/js/data/menu-data.js +++ b/js/data/menu-data.js | |||
@@ -140,6 +140,15 @@ exports.MenuData = Montage.create( Montage, { | |||
140 | } | 140 | } |
141 | }, | 141 | }, |
142 | { | 142 | { |
143 | "displayText" : "Chrome Preview", | ||
144 | "hasSubMenu" : false, | ||
145 | "enabled": true, | ||
146 | "checked": { | ||
147 | "value": false, | ||
148 | "boundProperty": "chromePreview" | ||
149 | } | ||
150 | }, | ||
151 | { | ||
143 | "displayText" : "Layout View", | 152 | "displayText" : "Layout View", |
144 | "hasSubMenu" : false, | 153 | "hasSubMenu" : false, |
145 | "enabled": true, | 154 | "enabled": true, |