aboutsummaryrefslogtreecommitdiff
path: root/js/data/pi
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-02-03 11:34:53 -0800
committerNivesh Rajbhandari2012-02-03 11:34:53 -0800
commit91de8f585e93d1a959c7fe56775df371ce6f50d6 (patch)
tree1621764c65cf2d0044e31e35b486e8409b31039f /js/data/pi
parentc203ea7413b5a2b2232d7f8346cd1b9932f2575b (diff)
parent01efeff045e7196bab37fc60f7030969ad650d6c (diff)
downloadninja-91de8f585e93d1a959c7fe56775df371ce6f50d6.tar.gz
Merge branch 'refs/heads/NiveshColor' into ToolFixes
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/data/pi')
-rw-r--r--js/data/pi/pi-data.js26
1 files changed, 16 insertions, 10 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index de5cd34d..1f8870ca 100644
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -23,13 +23,13 @@ exports.PiData = Montage.create( Montage, {
23 { 23 {
24 type : "color", 24 type : "color",
25 id : "colorStroke", 25 id : "colorStroke",
26 prop: "border-color", 26 prop: "border",
27 label : "Stroke" 27 label : "Stroke"
28 }, 28 },
29 { 29 {
30 type : "color", 30 type : "color",
31 id : "colorFill", 31 id : "colorFill",
32 prop: "background-color", 32 prop: "background",
33 divider : true 33 divider : true
34 } 34 }
35 ], 35 ],
@@ -102,11 +102,13 @@ exports.PiData = Montage.create( Montage, {
102 { 102 {
103 type : "color", 103 type : "color",
104 id : "colorStroke", 104 id : "colorStroke",
105 prop: "border",
105 label : "Stroke" 106 label : "Stroke"
106 }, 107 },
107 { 108 {
108 type : "color", 109 type : "color",
109 id : "colorFill", 110 id : "colorFill",
111 prop: "background",
110 divider : true 112 divider : true
111 } 113 }
112 ], 114 ],
@@ -221,13 +223,13 @@ exports.PiData = Montage.create( Montage, {
221 { 223 {
222 type : "color", 224 type : "color",
223 id : "colorStroke", 225 id : "colorStroke",
224 prop: "border-color", 226 prop: "border",
225 label : "Stroke" 227 label : "Stroke"
226 }, 228 },
227 { 229 {
228 type : "color", 230 type : "color",
229 id : "colorFill", 231 id : "colorFill",
230 prop: "background-color", 232 prop: "background",
231 divider : true 233 divider : true
232 } 234 }
233 ], 235 ],
@@ -279,11 +281,12 @@ exports.PiData = Montage.create( Montage, {
279 [ 281 [
280 { 282 {
281 type : "color", 283 type : "color",
282 id : "stroke", 284 prop: "border",
283 prop : "stroke" 285 id : "stroke"
284 }, 286 },
285 { 287 {
286 type : "color", 288 type : "color",
289 prop: "background",
287 id : "fill", 290 id : "fill",
288 prop : "fill", 291 prop : "fill",
289 divider : true 292 divider : true
@@ -399,12 +402,13 @@ exports.PiData = Montage.create( Montage, {
399 [ 402 [
400 { 403 {
401 type : "color", 404 type : "color",
402 id : "stroke", 405 prop: "border",
403 prop : "stroke" 406 id : "stroke"
404 }, 407 },
405 { 408 {
406 type : "color", 409 type : "color",
407 id : "fill", 410 id : "fill",
411 prop: "background",
408 visible : false, 412 visible : false,
409 divider : true 413 divider : true
410 } 414 }
@@ -451,11 +455,12 @@ exports.PiData = Montage.create( Montage, {
451 [ 455 [
452 { 456 {
453 type : "color", 457 type : "color",
454 id : "stroke", 458 prop: "border",
455 prop : "stroke" 459 id : "stroke"
456 }, 460 },
457 { 461 {
458 type : "color", 462 type : "color",
463 prop: "background",
459 id : "fill", 464 id : "fill",
460 prop : "fill", 465 prop : "fill",
461 divider : true 466 divider : true
@@ -467,6 +472,7 @@ exports.PiData = Montage.create( Montage, {
467 id : "strokeSize", 472 id : "strokeSize",
468 prop : "strokeSize", 473 prop : "strokeSize",
469 label : "Stroke", 474 label : "Stroke",
475 valueMutator: parseFloat,
470 min : 0, 476 min : 0,
471 max : 100, 477 max : 100,
472 value : 1, 478 value : 1,