aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-25 13:34:04 -0700
committerNivesh Rajbhandari2012-04-25 13:34:04 -0700
commit32a24988add5ba0ecf80caa31871cdd90e3eea5b (patch)
treefbf05f2dfc91e57ab9598046ff16798ea0ae1966 /js/data
parent60d6346a78fb5257eaf36f17a5fcb764a342c012 (diff)
parentd3a6350163ada5644d34ed8d5c2a00cef4db2afc (diff)
downloadninja-32a24988add5ba0ecf80caa31871cdd90e3eea5b.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Diffstat (limited to 'js/data')
-rwxr-xr-xjs/data/menu-data.js61
-rw-r--r--js/data/panels-data.js12
-rwxr-xr-xjs/data/tools-data.js6
3 files changed, 49 insertions, 30 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index a1fe2703..9e8bf945 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -39,8 +39,7 @@ exports.MenuData = Montage.create( Montage, {
39 "boundProperty": "activeDocument", 39 "boundProperty": "activeDocument",
40 "oneway": true, 40 "oneway": true,
41 "boundValueMutator": function(activeDocument){ 41 "boundValueMutator": function(activeDocument){
42 if(activeDocument !== null){return true;} 42 return activeDocument !== null;
43 else{return false;}
44 } 43 }
45 }, 44 },
46 "action": "executeFileClose" 45 "action": "executeFileClose"
@@ -54,8 +53,7 @@ exports.MenuData = Montage.create( Montage, {
54 "boundProperty": "activeDocument", 53 "boundProperty": "activeDocument",
55 "oneway": true, 54 "oneway": true,
56 "boundValueMutator": function(activeDocument){ 55 "boundValueMutator": function(activeDocument){
57 if(activeDocument !== null){return true;} 56 return activeDocument !== null;
58 else{return false;}
59 } 57 }
60 }, 58 },
61 "action": "executeFileCloseAll" 59 "action": "executeFileCloseAll"
@@ -73,8 +71,7 @@ exports.MenuData = Montage.create( Montage, {
73 "boundProperty": "activeDocument", 71 "boundProperty": "activeDocument",
74 "oneway": true, 72 "oneway": true,
75 "boundValueMutator": function(activeDocument){ 73 "boundValueMutator": function(activeDocument){
76 if(activeDocument !== null){return true;} 74 return activeDocument !== null;
77 else{return false;}
78 } 75 }
79 }, 76 },
80 "action": "executeSave" 77 "action": "executeSave"
@@ -87,9 +84,8 @@ exports.MenuData = Montage.create( Montage, {
87 "boundObj": "documentController", 84 "boundObj": "documentController",
88 "boundProperty": "activeDocument", 85 "boundProperty": "activeDocument",
89 "oneway": true, 86 "oneway": true,
90 "boundValueMutator": function(activeDocument){ 87 "boundValueMutator": function(activeDocument) {
91 if(activeDocument !== null){return true;} 88 return activeDocument !== null;
92 else{return false;}
93 } 89 }
94 }, 90 },
95 "action":"executeSaveAs" 91 "action":"executeSaveAs"
@@ -103,8 +99,7 @@ exports.MenuData = Montage.create( Montage, {
103 "boundProperty": "activeDocument", 99 "boundProperty": "activeDocument",
104 "oneway": true, 100 "oneway": true,
105 "boundValueMutator": function(activeDocument){ 101 "boundValueMutator": function(activeDocument){
106 if(activeDocument !== null){return true;} 102 return activeDocument !== null;
107 else{return false;}
108 } 103 }
109 }, 104 },
110 "action": "executeSaveAll" 105 "action": "executeSaveAll"
@@ -127,6 +122,26 @@ exports.MenuData = Montage.create( Montage, {
127 "displayText" : "Close Project", 122 "displayText" : "Close Project",
128 "hasSubMenu" : false, 123 "hasSubMenu" : false,
129 "enabled": false 124 "enabled": false
125 },
126 {
127 "displayText" : "",
128 "separator": true
129 },
130 {
131 "displayText" : "",
132 "separator": true
133 },
134 {
135 "displayText" : "New Webpage",
136 "hasSubMenu" : false,
137 "enabled": true,
138 "action": "executeNewWebpage"
139 },
140 {
141 "displayText" : "Open Webpage",
142 "hasSubMenu" : false,
143 "enabled": true,
144 "action": "executeWebpageOpen"
130 } 145 }
131 ] 146 ]
132 }, 147 },
@@ -184,8 +199,7 @@ exports.MenuData = Montage.create( Montage, {
184 "boundProperty": "activeDocument", 199 "boundProperty": "activeDocument",
185 "oneway": true, 200 "oneway": true,
186 "boundValueMutator": function(activeDocument){ 201 "boundValueMutator": function(activeDocument){
187 if((activeDocument !== null) && (activeDocument.currentView === "design")){return true;} 202 return (activeDocument !== null) && (activeDocument.currentView === "design");
188 else{return false;}
189 } 203 }
190 }, 204 },
191 "checked": { 205 "checked": {
@@ -202,8 +216,7 @@ exports.MenuData = Montage.create( Montage, {
202 "boundProperty": "activeDocument", 216 "boundProperty": "activeDocument",
203 "oneway": true, 217 "oneway": true,
204 "boundValueMutator": function(activeDocument){ 218 "boundValueMutator": function(activeDocument){
205 if((activeDocument !== null) && (activeDocument.currentView === "design")){return true;} 219 return (activeDocument !== null) && (activeDocument.currentView === "design");
206 else{return false;}
207 } 220 }
208 }, 221 },
209 "checked": { 222 "checked": {
@@ -220,8 +233,7 @@ exports.MenuData = Montage.create( Montage, {
220 "boundProperty": "activeDocument", 233 "boundProperty": "activeDocument",
221 "oneway": true, 234 "oneway": true,
222 "boundValueMutator": function(activeDocument){ 235 "boundValueMutator": function(activeDocument){
223 if((activeDocument !== null) && (activeDocument.currentView === "design")){return true;} 236 return (activeDocument !== null) && (activeDocument.currentView === "design");
224 else{return false;}
225 } 237 }
226 }, 238 },
227 "submenu": true, 239 "submenu": true,
@@ -267,8 +279,7 @@ exports.MenuData = Montage.create( Montage, {
267 "boundProperty": "activeDocument", 279 "boundProperty": "activeDocument",
268 "oneway": true, 280 "oneway": true,
269 "boundValueMutator": function(activeDocument){ 281 "boundValueMutator": function(activeDocument){
270 if((activeDocument !== null) && (activeDocument.currentView === "design")){return true;} 282 return (activeDocument !== null) && (activeDocument.currentView === "design");
271 else{return false;}
272 } 283 }
273 }, 284 },
274 "checked": { 285 "checked": {
@@ -326,8 +337,7 @@ exports.MenuData = Montage.create( Montage, {
326 "boundProperty": "activeDocument", 337 "boundProperty": "activeDocument",
327 "oneway": true, 338 "oneway": true,
328 "boundValueMutator": function(activeDocument){ 339 "boundValueMutator": function(activeDocument){
329 if((activeDocument !== null) && (activeDocument.currentView === "design")){return true;} 340 return (activeDocument !== null) && (activeDocument.currentView === "design");
330 else{return false;}
331 } 341 }
332 }, 342 },
333 "checked": { 343 "checked": {
@@ -348,8 +358,7 @@ exports.MenuData = Montage.create( Montage, {
348 "boundProperty": "activeDocument", 358 "boundProperty": "activeDocument",
349 "oneway": true, 359 "oneway": true,
350 "boundValueMutator": function(activeDocument){ 360 "boundValueMutator": function(activeDocument){
351 if((activeDocument !== null) && (activeDocument.currentView === "design")){return true;} 361 return (activeDocument !== null) && (activeDocument.currentView === "design");
352 else{return false;}
353 } 362 }
354 }, 363 },
355 "radio": true, 364 "radio": true,
@@ -367,8 +376,7 @@ exports.MenuData = Montage.create( Montage, {
367 "boundProperty": "activeDocument", 376 "boundProperty": "activeDocument",
368 "oneway": true, 377 "oneway": true,
369 "boundValueMutator": function(activeDocument){ 378 "boundValueMutator": function(activeDocument){
370 if((activeDocument !== null) && (activeDocument.currentView === "design")){return true;} 379 return (activeDocument !== null) && (activeDocument.currentView === "design");
371 else{return false;}
372 } 380 }
373 }, 381 },
374 "radio": true, 382 "radio": true,
@@ -386,8 +394,7 @@ exports.MenuData = Montage.create( Montage, {
386 "boundProperty": "activeDocument", 394 "boundProperty": "activeDocument",
387 "oneway": true, 395 "oneway": true,
388 "boundValueMutator": function(activeDocument){ 396 "boundValueMutator": function(activeDocument){
389 if((activeDocument !== null) && (activeDocument.currentView === "design")){return true;} 397 return (activeDocument !== null) && (activeDocument.currentView === "design");
390 else{return false;}
391 } 398 }
392 }, 399 },
393 "radio": true, 400 "radio": true,
diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index 7a2d817a..f613a3be 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -93,6 +93,18 @@ exports.PanelsData = Montage.create(Montage, {
93 open: true, 93 open: true,
94 modulePath: "js/panels/presets/content.reel", 94 modulePath: "js/panels/presets/content.reel",
95 moduleName: "content" 95 moduleName: "content"
96 },
97 {
98 name: "History",
99 minHeight: 100,
100 height: 100,
101 maxHeight: null,
102 flexible: true,
103 collapsed: true,
104 scrollable: true,
105 open: true,
106 modulePath: "js/panels/history-panel/history.reel",
107 moduleName: "History"
96 } 108 }
97 ] 109 ]
98 } 110 }
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index faf3336f..4d009530 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -151,7 +151,7 @@ exports.ToolsData = Montage.create(Montage, {
151 "properties": "fillProperties", 151 "properties": "fillProperties",
152 "spriteSheet": true, 152 "spriteSheet": true,
153 "action": "FillTool", 153 "action": "FillTool",
154 "toolTip": "Fill Tool",