Merge branch 'refs/heads/NinjaInternal' into FileIO

2 files changed, 19 insertions, 15 deletions

diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index de5cd34d..dd75e255 100755
--- 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,13 +281,13 @@ exports.PiData = Montage.create( Montage, {
                     [
                         {
                             type : "color",
-                            id : "stroke",
-                            prop : "stroke"
+                            prop: "border",
+                            id : "stroke"
                         },
                         {
                             type : "color",
+                            prop: "background",
                             id : "fill",
-                            prop : "fill",
                             divider : true
                         }
                     ],
@@ -399,12 +401,13 @@ exports.PiData = Montage.create( Montage, {
                     [
                         {
                             type : "color",
-                            id : "stroke",
-                            prop : "stroke"
+                            prop: "border",
+                            id : "stroke"
                         },
                         {
                             type : "color",
                             id : "fill",
+                            prop: "background",
                             visible : false,
                             divider : true
                         }
@@ -451,13 +454,13 @@ exports.PiData = Montage.create( Montage, {
                     [
                         {
                             type : "color",
-                            id : "stroke",
-                            prop : "stroke"
+                            prop: "border",
+                            id : "stroke"
                         },
                         {
                             type : "color",
+                            prop: "background",
                             id : "fill",
-                            prop : "fill",
                             divider : true
                         }
                     ],
@@ -467,6 +470,7 @@ exports.PiData = Montage.create( Montage, {
                             id : "strokeSize",
                             prop : "strokeSize",
                             label : "Stroke",
+                            valueMutator: parseFloat,
                             min :   0,
                             max :   100,
                             value : 1,
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 8ea84574..de965dbc 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -37,7 +37,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "rotate3DProperties",
                 "spriteSheet":  true,
                 "action":       "Rotate3DTool",
-                "toolTip":      "3D Rotate Object Tool",
+                "toolTip":      "3D Rotate Object Tool (W)",
                 "cursor":       "auto",
                 "lastInGroup":  false,
                 "container":    false,
@@ -48,7 +48,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "translate3DProperties",
                 "spriteSheet":  true,
                 "action":       "Translate3DTool",
-                "toolTip":      "3D Translate Object Tool",
+                "toolTip":      "3D Translate Object Tool (G)",
                 "cursor":       "auto",
                 "lastInGroup":  true,
                 "container":    false,
@@ -206,7 +206,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "panProperties",
                 "spriteSheet":  true,
                 "action":       "PanTool",
-                "toolTip":      "Pan Tool",
+                "toolTip":      "Hand Tool (H)",
                 "cursor":       "url('images/tools/hand_down.png'), default",
                 "lastInGroup":  false,
                 "container":    false,