Merge branch 'master' into pentool

1 files changed, 17 insertions, 0 deletions

diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js
index e26ab391..5ea6f70f 100755
--- a/js/components/layout/tools-list.reel/tools-list.js
+++ b/js/components/layout/tools-list.reel/tools-list.js
@@ -29,10 +29,27 @@ exports.ToolsList = Montage.create(Component, {
     RotateStageTool3D:      { value: null },
     PanTool:                { value: null },
     ZoomTool:               { value: null },
+    disabled:               { value: true},
+
+    handleOpenDocument: {
+        value: function(){
+            this.disabled = false;
+        }
+    },
+
+    handleCloseDocument: {
+        value: function(){
+            if(!this.application.ninja.documentController.activeDocument) {
+                this.disabled = true;
+            }
+        }
+    },
 
     prepareForDraw: {
         enumerable: false,
         value: function() {
+            this.eventManager.addEventListener( "openDocument", this, false);
+            this.eventManager.addEventListener( "closeDocument", this, false);
             this.PenTool.options = this.application.ninja.toolsProperties.shapeProperties.lineProperties;//this.application.Ninja.toolsProperties.penProperties;
 
             this.SelectionTool.options = this.application.ninja.toolsProperties.selectionProperties;