Merge branch 'master' into pentool

2 files changed, 36 insertions, 1 deletions

diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index 49f2d776..3c7a92fa 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.html
+++ b/js/components/layout/tools-properties.reel/tools-properties.html
@@ -136,6 +136,21 @@
                     "element": {"#": "zoomProperties"}
                 }
             },
+
+            "disable": {
+                "module": "montage/ui/condition.reel",
+                "name": "Condition",
+                "properties": {
+                    "element": {"#": "disabledCondition"}
+                },
+                "bindings": {
+                    "condition": {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "disabled",
+                        "oneway": true
+                    }
+                }
+            },
             
             "owner": {
                 "module": "js/components/layout/tools-properties.reel",
@@ -191,6 +206,7 @@
             <div id="rotateStageProperties"></div>
             <div id="panProperties"></div>
             <div id="zoomProperties"></div>
+            <div id="disabledCondition" class="panelDisabled"></div>
         </div>
     </body>
 </html>
diff --git a/js/components/layout/tools-properties.reel/tools-properties.js b/js/components/layout/tools-properties.reel/tools-properties.js
index 104aabb7..47945b58 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.js
+++ b/js/components/layout/tools-properties.reel/tools-properties.js
@@ -9,10 +9,29 @@ var Component = require("montage/ui/component").Component;
 
 exports.ToolsProperties = Montage.create(Component, {
 
+    disabled: {
+        value: true
+    },
+
+    handleCloseDocument: {
+        value: function(){
+            if(!this.application.ninja.documentController.activeDocument) {
+                this.disabled = true;
+            }
+        }
+    },
+
+    handleOpenDocument: {
+        value: function() {
+            this.disabled = false;
+        }
+    },
+
     prepareForDraw: {
         enumerable: false,
         value: function() {
-            //this.selectedTool = this.application.toolsData.selectedTool;
+            this.eventManager.addEventListener( "openDocument", this, false);
+            this.eventManager.addEventListener( "closeDocument", this, false);
         }
     },