Merge pull request #2 from mqg734/NiveshColor

Updated PI color code to go through mediator. Also enabled getting/setting color support for shapes.

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, {
                         {
                             type : "color",
                             id : "colorStroke",
-                            prop: "border-color",
+                            prop: "border",
                             label : "Stroke"
                         },
                         {
                             type : "color",
                             id : "colorFill",
-                            prop: "background-color",
+                            prop: "background",
                             divider : true
                         }
                     ],
@@ -102,11 +102,13 @@ exports.PiData = Montage.create( Montage, {
                         {
                             type : "color",
                             id : "colorStroke",
+                            prop: "border",
                             label : "Stroke"
                         },
                         {
                             type : "color",
                             id : "colorFill",
+                            prop: "background",
                             divider : true
                         }
                     ],
@@ -221,13 +223,13 @@ exports.PiData = Montage.create( Montage, {
                         {
                             type : "color",
                             id : "colorStroke",
-                            prop: "border-color",
+                            prop: "border",
                             label : "Stroke"
                         },
                         {
                             type : "color",
                             id : "colorFill",
-                            prop: "background-color",
+                            prop: "background",
                             divider : true
                         }
                     ],
@@ -279,10 +281,12 @@ exports.PiData = Montage.create( Montage, {
                     [
                         {
                             type : "color",
+                            prop: "border",
                             id : "stroke"
                         },
                         {
                             type : "color",
+                            prop: "background",
                             id : "fill",
                             divider : true
                         }
@@ -387,11 +391,13 @@ exports.PiData = Montage.create( Montage, {
                     [
                         {
                             type : "color",
+                            prop: "border",
                             id : "stroke"
                         },
                         {
                             type : "color",
                             id : "fill",
+                            prop: "background",
                             visible : false,
                             divider : true
                         }
@@ -438,10 +444,12 @@ exports.PiData = Montage.create( Montage, {
                     [
                         {
                             type : "color",
+                            prop: "border",
                             id : "stroke"
                         },
                         {
                             type : "color",
+                            prop: "background",
                             id : "fill",
                             divider : true
                         }