aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorEric Guzman2012-04-04 11:36:22 -0700
committerEric Guzman2012-04-04 11:36:22 -0700
commitaf52148777d554dc6e55a736574b82e4916f1fea (patch)
tree39705d138b489d2e90722238c850320fd6b6a8e9 /js/data
parentb7ca1821ad43403a2a54361ffc6a0cdf9cba0e59 (diff)
parenta11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff)
downloadninja-af52148777d554dc6e55a736574b82e4916f1fea.tar.gz
Merge branch 'refs/heads/master' into PresetsPI
Conflicts: js/controllers/presets-controller.js
Diffstat (limited to 'js/data')
-rwxr-xr-xjs/data/menu-data.js40
1 files changed, 4 insertions, 36 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 12007f4a..3333d209 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -154,17 +154,17 @@ exports.MenuData = Montage.create( Montage, {
154 { 154 {
155 "displayText" : "Cut", 155 "displayText" : "Cut",
156 "hasSubMenu" : false, 156 "hasSubMenu" : false,
157 "enabled": true 157 "enabled": false
158 }, 158 },
159 { 159 {
160 "displayText" : "Copy", 160 "displayText" : "Copy",
161 "hasSubMenu" : false, 161 "hasSubMenu" : false,
162 "enabled": true 162 "enabled": false
163 }, 163 },
164 { 164 {
165 "displayText" : "Paste", 165 "displayText" : "Paste",
166 "hasSubMenu" : false, 166 "hasSubMenu" : false,
167 "enabled": true 167 "enabled": false
168 } 168 }
169 ] 169 ]
170 }, 170 },
@@ -172,38 +172,6 @@ exports.MenuData = Montage.create( Montage, {
172 "header": "View", 172 "header": "View",
173 "entries": [ 173 "entries": [
174 { 174 {
175 "displayText" : "Zoom In",
176 "hasSubMenu" : false,
177 "enabled": {
178 "value": false,
179 "boundObj": "documentController",
180 "boundProperty": "activeDocument",
181 "oneway": true,
182 "boundValueMutator": function(activeDocument){
183 if((activeDocument !== null) && (activeDocument.currentView === "design")){return true;}
184 else{return false;}
185 }
186 }
187 },
188 {
189 "displayText" : "Zoom Out",
190 "hasSubMenu" : false,
191 "enabled": {
192 "value": false,
193 "boundObj": "documentController",
194 "boundProperty": "activeDocument",
195 "oneway": true,
196 "boundValueMutator": function(activeDocument){
197 if((activeDocument !== null) && (activeDocument.currentView === "design")){return true;}
198 else{return false;}
199 }
200 }
201 },
202 {
203 "displayText" : "",
204 "separator": true
205 },
206 {
207 "displayText" : "Live Preview", 175 "displayText" : "Live Preview",
208 "hasSubMenu" : false, 176 "hasSubMenu" : false,
209 "enabled": { 177 "enabled": {
@@ -431,7 +399,7 @@ exports.MenuData = Montage.create( Montage, {
431 { 399 {
432 "displayText" : "Debug", 400 "displayText" : "Debug",
433 "hasSubMenu" : false, 401 "hasSubMenu" : false,
434 "enabled": true, 402 "enabled": false,
435 "checked": { 403 "checked": {
436 "value": true, 404 "value": true,
437 "boundProperty": "debug" 405 "boundProperty": "debug"