aboutsummaryrefslogtreecommitdiff
path: root/js/data/pi
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-13 21:43:51 -0800
committerValerio Virgillito2012-02-13 21:43:51 -0800
commit081f17954c735fc8b946d72a25b0ee60d370ef9b (patch)
treede7b50f2d02365df897ef4356f953d3833c9cabd /js/data/pi
parent47df0aff81c25334b129047bb227ea5015357eda (diff)
parent1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff)
downloadninja-081f17954c735fc8b946d72a25b0ee60d370ef9b.tar.gz
Merge branch 'refs/heads/master' into components
Conflicts: js/components/treeview/ninja-leaf.reel/ninja-leaf.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/data/pi')
-rw-r--r--js/data/pi/pi-data.js22
1 files changed, 19 insertions, 3 deletions
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 ]