Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

2 files changed, 11 insertions, 5 deletions

diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index c47117f8..386d5d87 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/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,