diff options
author | John Mayhew | 2012-02-10 16:20:45 -0800 |
---|---|---|
committer | John Mayhew | 2012-02-10 16:20:45 -0800 |
commit | eb0032234971f2c1c471f562d52c086fcffe8a14 (patch) | |
tree | 9fe9a49b5b49c3c0d15ea4fc124df4c100ffb730 /js/data/pi | |
parent | 730c1e191e36b8ab8dba576c481a6585e0dfa69e (diff) | |
parent | 344933fd505afb9f5dfa3be8cc959112df04da0a (diff) | |
download | ninja-eb0032234971f2c1c471f562d52c086fcffe8a14.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Diffstat (limited to 'js/data/pi')
-rw-r--r-- | js/data/pi/pi-data.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 10b33a0e..8ffd0ec7 100644 --- 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 | ] |