8 files changed, 77 insertions, 46 deletions

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index 9f24cee5..413f588d 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -61,9 +61,9 @@
                         }
                     }
                 },
-                "Disable": {
-                    "module": "montage/ui/condition.reel",
-                    "name": "Condition",
+
+                "disable": {
+                    "prototype": "montage/ui/condition.reel",
                     "properties": {
                         "element": {"#": "disabledCondition"}
                     },
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index ff1d1071..ab390fc6 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -13,7 +13,7 @@ exports.Breadcrumb = Montage.create(Component, {
         value: true
     },
 
-    handleOnOpenDocument: {
+    handleOpenDocument: {
         value: function(){
             this.disabled = false;
         }
@@ -27,7 +27,6 @@ exports.Breadcrumb = Montage.create(Component, {
         }
     },
 
-
     _container:{
         value:null
     },
@@ -50,8 +49,8 @@ exports.Breadcrumb = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
-            this.eventManager.addEventListener( "onOpenDocument", this, false);
-            this.eventManager.addEventListener( "closeDocument", this, false);
+            this.eventManager.addEventListener("openDocument", this, false);
+            this.eventManager.addEventListener("closeDocument", this, false);
             this.breadcrumbBt.addEventListener("action", this, false);
         }
     },
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;
             }
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/tool