From ac2db49e51f82f5a1cf52ec854b047e007ffbdd7 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Mon, 12 Mar 2012 13:39:58 -0700
Subject: Committing Disabled states for tool-bar, tool-options, viewbar,
 breadcrumb

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 js/components/layout/document-bar.reel/document-bar.html | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'js/components/layout/document-bar.reel/document-bar.html')

diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index 48f1423c..5a4ca2be 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.html
@@ -41,6 +41,20 @@
                     "codeView": {"#": "code"},
                     "zoomControl": {"@": "hottext1"}
                 }
+            },
+            "Disable": {
+                "module": "montage/ui/condition.reel",
+                "name": "Condition",
+                "properties": {
+                    "element": {"#": "disabledCondition"}
+                },
+                "bindings": {
+                    "condition": {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "disabled",
+                        "oneway": true
+                    }
+                }
             }
     	}
 	</script>
@@ -53,6 +67,7 @@
         <input class="zoomHotText label" id="zoomControlHT"/>
         <span class="design-view disable" id="design">Design View</span>
         <span class="code-view disable" id="code">Code View</span>
+        <div id="disabledCondition" class="panelDisabled"></div>
     </div>
 </body>
 </html>
\ No newline at end of file
-- 
cgit v1.2.3


From c24f58c10231c30d3a8a4c9fb9a4f395dd746180 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Mon, 12 Mar 2012 16:25:47 -0700
Subject: Merge dhg637 DisabledState into master.

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

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 .../layout/document-bar.reel/document-bar.html     | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'js/components/layout/document-bar.reel/document-bar.html')

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>
-- 
cgit v1.2.3