aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tools-list.reel/tools-list.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-14 15:17:01 -0700
committerJose Antonio Marquez2012-03-14 15:17:01 -0700
commite7e18f02870a0cfe06e550acf8ffef6eab945231 (patch)
treec940a63fd47e60f121c42b1823194522c8c2820f /js/components/layout/tools-list.reel/tools-list.html
parentef601b13a2529c207eb782942e918212e5a0805e (diff)
parent089534a80c64226bf7d124ab9147afce386fdb5c (diff)
downloadninja-e7e18f02870a0cfe06e550acf8ffef6eab945231.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/components/layout/tools-list.reel/tools-list.html')
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html19
1 files changed, 16 insertions, 3 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 2c5617e5..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 @@
136 "name": "ZoomTool" 136 "name": "ZoomTool"
137 }, 137 },
138 138
139 "disable": {
140 "module": "montage/ui/condition.reel",
141 "name": "Condition",
142 "properties": {
143 "element": {"#": "disabledCondition"}
144 },
145 "bindings": {
146 "condition": {
147 "boundObject": {"@": "owner"},
148 "boundObjectPropertyPath": "disabled",
149 "oneway": true
150 }
151 }
152 },
153
139 "owner": { 154 "owner": {
140 "module": "js/components/layout/tools-list.reel", 155 "module": "js/components/layout/tools-list.reel",
141 "name": "ToolsList", 156 "name": "ToolsList",
@@ -166,9 +181,6 @@
166 ] 181 ]
167 } 182 }
168 } 183 }
169
170
171
172 } 184 }
173 </script> 185 </script>
174 186
@@ -184,6 +196,7 @@
184 </div> 196 </div>
185 <!-- TODO: Remove and add as a component --> 197 <!-- TODO: Remove and add as a component -->
186 <div id="colortoolbar"></div> 198 <div id="colortoolbar"></div>
199 <div id="disabledCondition" class="panelDisabled"></div>
187 </div> 200 </div>
188 201
189 </body> 202 </body>