aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorJose Antonio Marquez Russo2012-02-01 17:11:21 -0800
committerJose Antonio Marquez Russo2012-02-01 17:11:21 -0800
commit83ac41dd75ec551cdb03252e0bf3081182517d05 (patch)
tree75781b24936e90c815f13dd5d2158c65fef643e3 /js/data
parent9c317ebb46e82a00b83eb732c73ae39ce9ef46b9 (diff)
parent830b011d94d728882286d72e129f7405134957c7 (diff)
downloadninja-83ac41dd75ec551cdb03252e0bf3081182517d05.tar.gz
Merge pull request #2 from mqg734/NiveshColor
Updated PI color code to go through mediator. Also enabled getting/setting color support for shapes.
Diffstat (limited to 'js/data')
-rw-r--r--js/data/pi/pi-data.js16
1 files changed, 12 insertions, 4 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index f162e919..748f19bb 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,10 +281,12 @@ exports.PiData = Montage.create( Montage, {
279 [ 281 [
280 { 282 {
281 type : "color", 283 type : "color",
284 prop: "border",
282 id : "stroke" 285 id : "stroke"
283 }, 286 },
284 { 287 {
285 type : "color", 288 type : "color",
289 prop: "background",
286 id : "fill", 290 id : "fill",
287 divider : true 291 divider : true
288 } 292 }
@@ -387,11 +391,13 @@ exports.PiData = Montage.create( Montage, {
387 [ 391 [
388 { 392 {
389 type : "color", 393 type : "color",
394 prop: "border",
390 id : "stroke" 395 id : "stroke"
391 }, 396 },
392 { 397 {
393 type : "color", 398 type : "color",
394 id : "fill", 399 id : "fill",
400 prop: "background",
395 visible : false, 401 visible : false,
396 divider : true 402 divider : true
397 } 403 }
@@ -438,10 +444,12 @@ exports.PiData = Montage.create( Montage, {
438 [ 444 [
439 { 445 {
440 type : "color", 446 type : "color",
447 prop: "border",
441 id : "stroke" 448 id : "stroke"
442 }, 449 },
443 { 450 {
444 type : "color", 451 type : "color",
452 prop: "background",
445 id : "fill", 453 id : "fill",
446 divider : true 454 divider : true
447 } 455 }