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/tools-list.reel/tools-list.html | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'js/components/layout/tools-list.reel/tools-list.html')

diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 2c5617e5..3e49a4f3 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -165,6 +165,21 @@
                         {"@": "repetition1"}
                     ]
                 }
+            },
+
+            "disabledCondition": {
+                "module": "montage/ui/condition.reel",
+                "name": "Condition",
+                "properties": {
+                    "element": {"#": "disabledCondition"}
+                },
+                "bindings": {
+                    "condition": {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "disabled",
+                        "oneway": true
+                    }
+                }
             }
 
 
@@ -184,6 +199,7 @@
             </div>
             <!-- TODO: Remove and add as a component -->
             <div id="colortoolbar"></div>
+            <div id="disabledCondition" class="panelDisabled"></div>
         </div>
 
     </body>
-- 
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/tools-list.reel/tools-list.html         | 33 ++++++++++------------
 1 file changed, 15 insertions(+), 18 deletions(-)

(limited to 'js/components/layout/tools-list.reel/tools-list.html')

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