aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorEric Guzman2012-02-13 15:48:37 -0800
committerEric Guzman2012-02-13 15:48:37 -0800
commitb2672478decd3ee3bfacf86b525551c997f9604d (patch)
tree79a88684406d3adf00350246a4da884b97fb0eac /js/data
parenta738121a921e4c721b280434952b415b9ab3b1a8 (diff)
parent0620e2f788861e824d6e49fa319da4d20b18a556 (diff)
downloadninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts: js/controllers/styles-controller.js
Diffstat (limited to 'js/data')
-rw-r--r--js/data/menu-data.js41
-rw-r--r--js/data/pi/pi-data.js22
2 files changed, 36 insertions, 27 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index e9e47dc0..34adc82d 100644
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -10,7 +10,7 @@ exports.MenuData = Montage.create( Montage, {
10 topLevelMenu: { 10 topLevelMenu: {
11 value: [ 11 value: [
12 { 12 {
13 "header": "FILE", 13 "header": "File",
14 "entries": [ 14 "entries": [
15 { 15 {
16 "displayText" : "New Project", 16 "displayText" : "New Project",
@@ -71,7 +71,7 @@ exports.MenuData = Montage.create( Montage, {
71 ] 71 ]
72 }, 72 },
73 { 73 {
74 "header": "EDIT", 74 "header": "Edit",
75 "entries": [ 75 "entries": [
76 { 76 {
77 "displayText" : "Undo", 77 "displayText" : "Undo",
@@ -111,7 +111,7 @@ exports.MenuData = Montage.create( Montage, {
111 ] 111 ]
112 }, 112 },
113 { 113 {
114 "header": "VIEW", 114 "header": "View",
115 "entries": [ 115 "entries": [
116 { 116 {
117 "displayText" : "Zoom In", 117 "displayText" : "Zoom In",
@@ -282,7 +282,7 @@ exports.MenuData = Montage.create( Montage, {
282 ] 282 ]
283 }, 283 },
284 { 284 {
285 "header": "WINDOW", 285 "header": "Window",
286 "entries": [ 286 "entries": [
287 { 287 {
288 "displayText" : "Tools", 288 "displayText" : "Tools",
@@ -356,41 +356,34 @@ exports.MenuData = Montage.create( Montage, {
356 ] 356 ]
357 }, 357 },
358 { 358 {
359 "header": "HELP", 359 "header": "Help",
360 "entries": [ 360 "entries": [
361 { 361 {
362 "displayText" : "About", 362 "displayText" : "Ninja FAQ",
363 "hasSubMenu" : false, 363 "hasSubMenu" : false,
364 "enabled": true 364 "enabled": true,
365 "action": "executeHelpFAQ"
365 }, 366 },
366 { 367 {
367 "displayText" : "FAQ", 368 "displayText" : "Ninja Forums",
368 "hasSubMenu" : false, 369 "hasSubMenu" : false,
369 "enabled": true 370 "enabled": true,
371 "action": "executeHelpForums"
370 }, 372 },
371 { 373 {
372 "displayText" : "Forums", 374 "displayText" : "Help Topics",
373 "hasSubMenu" : false, 375 "hasSubMenu" : false,
374 "enabled": true 376 "enabled": true,
375 } 377 "action": "executeHelpTopics"
376 ]
377 },
378 {
379 "header": "TEST",
380 "entries": [
381 {
382 "displayText" : "Open CSS View",
383 "hasSubMenu" : false,
384 "enabled": true
385 }, 378 },
386 { 379 {
387 "displayText" : "Open JS View", 380 "displayText" : "About Ninja...",
388 "hasSubMenu" : false, 381 "hasSubMenu" : false,
389 "enabled": true 382 "enabled": true,
383 "action": "executeHelpAbout"
390 } 384 }
391 ] 385 ]
392 } 386 }
393
394 ] 387 ]
395 } 388 }
396}); 389});
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 10b33a0e..ba03c347 100644
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -10,7 +10,21 @@ var Montage = require("montage/core/core").Montage,
10exports.PiData = Montage.create( Montage, { 10exports.PiData = Montage.create( Montage, {
11 11
12 stagePi: { 12 stagePi: {
13 value: [] 13 value: [
14 {
15 label: "Style",
16
17 Section: [
18 [
19 {
20 type : "chip",
21 id : "background",
22 prop: "background"
23 }
24 ]
25 ]
26 }
27 ]
14 }, 28 },
15 29
16 blockPi: { 30 blockPi: {
@@ -459,12 +473,14 @@ exports.PiData = Montage.create( Montage, {
459 [ 473 [
460 { 474 {
461 type: "dropdown", 475 type: "dropdown",
462 id: "stroke", 476 id: "strokeMaterial",
477 prop: "strokeMaterial",
463 label: "Stroke", 478 label: "Stroke",
464 labelField: "_name", 479 labelField: "_name",
465 dataField: "_name", 480 dataField: "_name",
466 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, 481 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
467 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } 482 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
483 divider : true
468 } 484 }
469 ] 485 ]
470 ] 486 ]