Merge dhg637 DisabledState into master.

Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumb

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

2 files changed, 17 insertions, 20 deletions

diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 3e49a4f3..5996e446 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -136,6 +136,21 @@
                 "name": "ZoomTool"
             },
 
+            "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-list.reel",
                 "name": "ToolsList",
@@ -165,25 +180,7 @@
                         {"@": "repetition1"}
                     ]
                 }
-            },
-
-            "disabledCondition": {
-                "module": "montage/ui/condition.reel",
-                "name": "Condition",
-                "properties": {
-                    "element": {"#": "disabledCondition"}
-                },
-                "bindings": {
-                    "condition": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "disabled",
-                        "oneway": true
-                    }
-                }
             }
-
-
-
         }
             </script>
 
diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js
index b44f63b3..5ea6f70f 100755
--- a/js/components/layout/tools-list.reel/tools-list.js
+++ b/js/components/layout/tools-list.reel/tools-list.js
@@ -31,7 +31,7 @@ exports.ToolsList = Montage.create(Component, {
     ZoomTool:               { value: null },
     disabled:               { value: true},
 
-    handleOnOpenDocument: {
+    handleOpenDocument: {
         value: function(){
             this.disabled = false;
         }
@@ -48,7 +48,7 @@ exports.ToolsList = Montage.create(Component, {
     prepareForDraw: {
         enumerable: false,
         value: function() {
-            this.eventManager.addEventListener( "onOpenDocument", this, false);
+            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;