aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-08 13:14:29 -0800
committerJose Antonio Marquez2012-02-08 13:14:29 -0800
commit9b45b897949bf934c8bf2c90ee2ff78f8713cb12 (patch)
treee7c276a3934c823cab894f46ee7dc5d3eda9ca83 /js/data
parentaa01c1210f3a4d9fd55a771b9de2c58ee3fa4bb6 (diff)
parent10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 (diff)
downloadninja-9b45b897949bf934c8bf2c90ee2ff78f8713cb12.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js
Diffstat (limited to 'js/data')
-rw-r--r--js/data/pi/pi-data.js62
-rw-r--r--js/data/tools-data.js6
2 files changed, 57 insertions, 11 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 748f19bb..39194412 100644
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -364,18 +364,35 @@ exports.PiData = Montage.create( Montage, {
364 Section: [ 364 Section: [
365 [ 365 [
366 { 366 {
367 type: "checkbox",
368 id: "useWebGl",
369 prop: "useWebGl",
370 defaultValue: false,
371 value: "Use WebGL",
372 checked: false
373 }
374 ],
375 [
376 {
367 type: "dropdown", 377 type: "dropdown",
368 id: "strokeMaterial", 378 id: "strokeMaterial",
369 label: "Stroke", 379 label: "Stroke",
370 labelField: "_name", 380 labelField: "_name",
371 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 381 dataField: "_name",
372 }, 382 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
383 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
384 divider : true
385 }
386 ],
387 [
373 { 388 {
374 type: "dropdown", 389 type: "dropdown",
375 id: "fillMaterial", 390 id: "fillMaterial",
376 label: "Fill", 391 label: "Fill",
377 labelField: "_name", 392 labelField: "_name",
378 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 393 dataField: "_name",
394 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
395 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
379 } 396 }
380 ] 397 ]
381 ] 398 ]
@@ -424,11 +441,23 @@ exports.PiData = Montage.create( Montage, {
424 Section: [ 441 Section: [
425 [ 442 [
426 { 443 {
444 type: "checkbox",
445 id: "useWebGl",
446 prop: "useWebGl",
447 defaultValue: false,
448 value: "Use WebGL",
449 checked: false
450 }
451 ],
452 [
453 {
427 type: "dropdown", 454 type: "dropdown",
428 id: "stroke", 455 id: "stroke",
429 label: "Stroke", 456 label: "Stroke",
430 labelField: "_name", 457 labelField: "_name",
431 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 458 dataField: "_name",
459 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
460 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
432 } 461 }
433 ] 462 ]
434 ] 463 ]
@@ -496,18 +525,35 @@ exports.PiData = Montage.create( Montage, {
496 Section: [ 525 Section: [
497 [ 526 [
498 { 527 {
528 type: "checkbox",
529 id: "useWebGl",
530 prop: "useWebGl",
531 defaultValue: false,
532 value: "Use WebGL",
533 checked: false
534 }
535 ],
536 [
537 {
499 type: "dropdown", 538 type: "dropdown",
500 id: "strokeMaterial", 539 id: "strokeMaterial",
501 label: "Stroke", 540 label: "Stroke",
502 labelFunction: function(item) { return item.getName(); }, 541 labelField: "_name",
503 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 542 dataField: "_name",
504 }, 543 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
544 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
545 divider : true
546 }
547 ],
548 [
505 { 549 {
506 type: "dropdown", 550 type: "dropdown",
507 id: "fillMaterial", 551 id: "fillMaterial",
508 label: "Fill", 552 label: "Fill",
509 labelField: "_name", 553 labelField: "_name",
510 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 554 dataField: "_name",
555 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
556 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
511 } 557 }
512 ] 558 ]
513 ] 559 ]
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 8ea84574..de965dbc 100644
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -37,7 +37,7 @@ exports.ToolsData = Montage.create(Montage, {
37 "properties": "rotate3DProperties", 37 "properties": "rotate3DProperties",
38 "spriteSheet": true, 38 "spriteSheet": true,
39 "action": "Rotate3DTool", 39 "action": "Rotate3DTool",
40 "toolTip": "3D Rotate Object Tool", 40 "toolTip": "3D Rotate Object Tool (W)",
41 "cursor": "auto", 41 "cursor": "auto",
42 "lastInGroup": false, 42 "lastInGroup": false,
43 "container": false, 43 "container": false,
@@ -48,7 +48,7 @@ exports.ToolsData = Montage.create(Montage, {
48 "properties": "translate3DProperties", 48 "properties": "translate3DProperties",
49 "spriteSheet": true, 49 "spriteSheet": true,
50 "action": "Translate3DTool", 50 "action": "Translate3DTool",
51 "toolTip": "3D Translate Object Tool", 51 "toolTip": "3D Translate Object Tool (G)",
52 "cursor": "auto", 52 "cursor": "auto",
53 "lastInGroup": true, 53 "lastInGroup": true,
54 "container": false, 54 "container": false,
@@ -206,7 +206,7 @@ exports.ToolsData = Montage.create(Montage, {
206 "properties": "panProperties", 206 "properties": "panProperties",
207 "spriteSheet": true, 207 "spriteSheet": true,
208 "action": "PanTool", 208 "action": "PanTool",
209 "toolTip": "Pan Tool", 209 "toolTip": "Hand Tool (H)",
210 "cursor": "url('images/tools/hand_down.png'), default", 210 "cursor": "url('images/tools/hand_down.png'), default",
211 "lastInGroup": false, 211 "lastInGroup": false,
212 "container": false, 212 "container": false,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 12:07:24 +0000