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, 18 insertions, 18 deletions

diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index 5a4ca2be..bd13f231 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.html
@@ -32,19 +32,8 @@
                 }
             },
 
-            "owner": {
-                "module": "js/components/layout/document-bar.reel",
-                "name": "DocumentBar",
-                "properties": {
-                    "element": {"#": "documentBar"},
-                    "designView": {"#": "design"},
-                    "codeView": {"#": "code"},
-                    "zoomControl": {"@": "hottext1"}
-                }
-            },
-            "Disable": {
-                "module": "montage/ui/condition.reel",
-                "name": "Condition",
+            "disable": {
+                "prototype": "montage/ui/condition.reel",
                 "properties": {
                     "element": {"#": "disabledCondition"}
                 },
@@ -55,6 +44,17 @@
                         "oneway": true
                     }
                 }
+            },
+
+            "owner": {
+                "module": "js/components/layout/document-bar.reel",
+                "name": "DocumentBar",
+                "properties": {
+                    "element": {"#": "documentBar"},
+                    "designView": {"#": "design"},
+                    "codeView": {"#": "code"},
+                    "zoomControl": {"@": "hottext1"}
+                }
             }
         }
         </script>
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 1f2deb59..4dc39fd6 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -13,7 +13,7 @@ exports.DocumentBar = Montage.create(Component, {
     codeView: { value: null, enumerable: false},
     zoomControl: { value: null, enumerable: false },
     _type: { enumerable: false, value: null },
-    disabled: {value: true},
+    disabled: { value: true },
 
 
 
@@ -87,7 +87,7 @@ exports.DocumentBar = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
-            this.eventManager.addEventListener( "onOpenDocument", this, false);
+            this.eventManager.addEventListener( "openDocument", this, false);
             this.eventManager.addEventListener( "closeDocument", this, false);
             this.designView.addEventListener("click", this, false);
             this.codeView.addEventListener("click", this, false);
@@ -104,14 +104,14 @@ exports.DocumentBar = Montage.create(Component, {
         }
     },
 
-    handleOnOpenDocument: {
-        value: function(){
+    handleOpenDocument: {
+        value: function() {
             this.disabled = false;
         }
     },
 
     handleCloseDocument: {
-        value: function(){
+        value: function() {
             if(!this.application.ninja.documentController.activeDocument) {
                 this.disabled = true;
             }