aboutsummaryrefslogtreecommitdiff
path: root/js/data/pi
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-02-06 14:03:40 -0800
committerNivesh Rajbhandari2012-02-06 14:18:58 -0800
commitf94b0c5ada403379b3ff8a900c2a2aabcecce49e (patch)
tree07d28ffb913e0a06e70d0792dcd1b2a87f7b7a83 /js/data/pi
parent5737864d1d55d96e3cc3c1bc9b38ec58303b3981 (diff)
downloadninja-f94b0c5ada403379b3ff8a900c2a2aabcecce49e.tar.gz
Add enabled property for ComboBox to support enabling/disabling materials dropdowns in the PI.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/data/pi')
-rw-r--r--js/data/pi/pi-data.js11
1 files changed, 8 insertions, 3 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 8ccf17cc..901ca37f 100644
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -385,6 +385,7 @@ exports.PiData = Montage.create( Montage, {
385 label: "Stroke", 385 label: "Stroke",
386 labelField: "_name", 386 labelField: "_name",
387 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, 387 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
388 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
388 divider : true 389 divider : true
389 } 390 }
390 ], 391 ],
@@ -395,7 +396,8 @@ exports.PiData = Montage.create( Montage, {
395 prop: "fillMaterial", 396 prop: "fillMaterial",
396 label: "Fill", 397 label: "Fill",
397 labelField: "_name", 398 labelField: "_name",
398 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 399 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
400 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
399 } 401 }
400 ] 402 ]
401 ] 403 ]
@@ -458,7 +460,8 @@ exports.PiData = Montage.create( Montage, {
458 id: "stroke", 460 id: "stroke",
459 label: "Stroke", 461 label: "Stroke",
460 labelField: "_name", 462 labelField: "_name",
461 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 463 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
464 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
462 } 465 }
463 ] 466 ]
464 ] 467 ]
@@ -543,6 +546,7 @@ exports.PiData = Montage.create( Montage, {
543 label: "Stroke", 546 label: "Stroke",
544 labelFunction: function(item) { return item.getName(); }, 547 labelFunction: function(item) { return item.getName(); },
545 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, 548 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
549 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
546 divider : true 550 divider : true
547 } 551 }
548 ], 552 ],
@@ -553,7 +557,8 @@ exports.PiData = Montage.create( Montage, {
553 prop: "fillMaterial", 557 prop: "fillMaterial",
554 label: "Fill", 558 label: "Fill",
555 labelField: "_name", 559 labelField: "_name",
556 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 560 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
561 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
557 } 562 }
558 ] 563 ]
559 ] 564 ]