Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal

3 files changed, 18 insertions, 8 deletions

diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 6c597542..b6350893 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -24,9 +24,15 @@ exports.MenuData = Montage.create(Component, {
 
             this._currentDocument = value;
 
-            this.documentEnabledIndices.forEach(function(index) {
-                index.enabled = true;
-            });
+            if(!this._currentDocument) {
+                this.documentEnabledIndices.forEach(function(index) {
+                    index.enabled = false;
+                });
+            } else {
+                this.documentEnabledIndices.forEach(function(index) {
+                    index.enabled = true;
+                });
+            }
 
         }
     },
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 157cbc64..92d70141 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -703,13 +703,14 @@ exports.PiData = Montage.create( Montage, {
                         {
                             type : "color",
                             prop: "border",
-                            id : "stroke"
+                            id : "stroke",
+                            visible: false
                         },
                         {
                             type : "color",
                             id : "fill",
                             prop: "background",
-                            visible : false,
+                            visible : true,
                             divider : true
                         }
                     ],
@@ -761,7 +762,9 @@ exports.PiData = Montage.create( Montage, {
                             valueMutator: parseFloat,
                             min :   0,
                             max :   100,
-                            value : 0
+                            value : 0,
+                            acceptableUnits: [" "],
+                            unit: " "
                         }
                     ]
                 ]
@@ -788,6 +791,7 @@ exports.PiData = Montage.create( Montage, {
                             min :   -90,
                             max :   90,
                             value : 0,
+                            acceptableUnits: ["deg."],
                             unit : "deg."
                         }
                     ]
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 05455efe..138f9f4d 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -104,7 +104,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "penProperties",
                 "spriteSheet":  true,
                 "action":       "PenTool",
-                "toolTip":      "Pen Tool",
+                "toolTip":      "Pen Tool (P)",
                 "cursor":       "auto",
                 "lastInGroup":  false,
                 "container":    false,
@@ -165,7 +165,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "brushProperties",
                 "spriteSheet":  true,
                 "action":       "BrushTool",
-                "toolTip":      "Brush Tool",
+                "toolTip":      "Brush Tool (B)",
                 "cursor":       "url('images/tools/brush_down.png') 9 17, default",
                 "lastInGroup":  false,
                 "container":    false,