aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-11 22:37:34 -0800
committerJose Antonio Marquez2012-02-11 22:37:34 -0800
commit9f2356c48b831d32d7278648656fe44b98bc4a1f (patch)
tree58459a2e2e45ff2f4ffa9042740040ee17d91dfb /js/data
parent5eb38b8bd779c7fb6e59b966135f8d306378f034 (diff)
parente142611e22718b1f1d1696902ad9161ec5f33f98 (diff)
downloadninja-9f2356c48b831d32d7278648656fe44b98bc4a1f.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts: js/ninja.reel/ninja.html
Diffstat (limited to 'js/data')
-rwxr-xr-xjs/data/menu-data.js41
-rwxr-xr-xjs/data/pi/pi-data.js6
2 files changed, 21 insertions, 26 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 683be2dc..3a065958 100755
--- 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",
@@ -74,7 +74,7 @@ exports.MenuData = Montage.create( Montage, {
74 ] 74 ]
75 }, 75 },
76 { 76 {
77 "header": "EDIT", 77 "header": "Edit",
78 "entries": [ 78 "entries": [
79 { 79 {
80 "displayText" : "Undo", 80 "displayText" : "Undo",
@@ -114,7 +114,7 @@ exports.MenuData = Montage.create( Montage, {
114 ] 114 ]
115 }, 115 },
116 { 116 {
117 "header": "VIEW", 117 "header": "View",
118 "entries": [ 118 "entries": [
119 { 119 {
120 "displayText" : "Zoom In", 120 "displayText" : "Zoom In",
@@ -285,7 +285,7 @@ exports.MenuData = Montage.create( Montage, {
285 ] 285 ]
286 }, 286 },
287 { 287 {
288 "header": "WINDOW", 288 "header": "Window",
289 "entries": [ 289 "entries": [
290 { 290 {
291 "displayText" : "Tools", 291 "displayText" : "Tools",
@@ -359,41 +359,34 @@ exports.MenuData = Montage.create( Montage, {
359 ] 359 ]
360 }, 360 },
361 { 361 {
362 "header": "HELP", 362 "header": "Help",
363 "entries": [ 363 "entries": [
364 { 364 {
365 "displayText" : "About", 365 "displayText" : "Ninja FAQ",
366 "hasSubMenu" : false, 366 "hasSubMenu" : false,
367 "enabled": true 367 "enabled": true,
368 "action": "executeHelpFAQ"
368 }, 369 },
369 { 370 {
370 "displayText" : "FAQ", 371 "displayText" : "Ninja Forums",
371 "hasSubMenu" : false, 372 "hasSubMenu" : false,
372 "enabled": true 373 "enabled": true,
374 "action": "executeHelpForums"
373 }, 375 },
374 { 376 {
375 "displayText" : "Forums", 377 "displayText" : "Help Topics",
376 "hasSubMenu" : false, 378 "hasSubMenu" : false,
377 "enabled": true 379 "enabled": true,
378 } 380 "action": "executeHelpTopics"
379 ]
380 },
381 {
382 "header": "TEST",
383 "entries": [
384 {
385 "displayText" : "Open CSS View",
386 "hasSubMenu" : false,
387 "enabled": true
388 }, 381 },
389 { 382 {
390 "displayText" : "Open JS View", 383 "displayText" : "About Ninja...",
391 "hasSubMenu" : false, 384 "hasSubMenu" : false,
392 "enabled": true 385 "enabled": true,
386 "action": "executeHelpAbout"
393 } 387 }
394 ] 388 ]
395 } 389 }
396
397 ] 390 ]
398 } 391 }
399}); 392});
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 10b33a0e..8ffd0ec7 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -459,12 +459,14 @@ exports.PiData = Montage.create( Montage, {
459 [ 459 [
460 { 460 {
461 type: "dropdown", 461 type: "dropdown",
462 id: "stroke", 462 id: "strokeMaterial",
463 prop: "strokeMaterial",
463 label: "Stroke", 464 label: "Stroke",
464 labelField: "_name", 465 labelField: "_name",
465 dataField: "_name", 466 dataField: "_name",
466 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, 467 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
467 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } 468 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
469 divider : true
468 } 470 }
469 ] 471 ]
470 ] 472 ]