diff options
author | Valerio Virgillito | 2012-03-12 16:25:47 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-12 16:25:47 -0700 |
commit | c24f58c10231c30d3a8a4c9fb9a4f395dd746180 (patch) | |
tree | a0be6ee1daa3e21ed7df483721bc3116e4c20006 /js/components/layout/tools-properties.reel/tools-properties.html | |
parent | ac2db49e51f82f5a1cf52ec854b047e007ffbdd7 (diff) | |
download | ninja-c24f58c10231c30d3a8a4c9fb9a4f395dd746180.tar.gz |
Merge dhg637 DisabledState into master.
Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumb
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/components/layout/tools-properties.reel/tools-properties.html')
-rwxr-xr-x | js/components/layout/tools-properties.reel/tools-properties.html | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html index 49f2d776..3c7a92fa 100755 --- a/js/components/layout/tools-properties.reel/tools-properties.html +++ b/js/components/layout/tools-properties.reel/tools-properties.html | |||
@@ -136,6 +136,21 @@ | |||
136 | "element": {"#": "zoomProperties"} | 136 | "element": {"#": "zoomProperties"} |
137 | } | 137 | } |
138 | }, | 138 | }, |
139 | |||
140 | "disable": { | ||
141 | "module": "montage/ui/condition.reel", | ||
142 | "name": "Condition", | ||
143 | "properties": { | ||
144 | "element": {"#": "disabledCondition"} | ||
145 | }, | ||
146 | "bindings": { | ||
147 | "condition": { | ||
148 | "boundObject": {"@": "owner"}, | ||
149 | "boundObjectPropertyPath": "disabled", | ||
150 | "oneway": true | ||
151 | } | ||
152 | } | ||
153 | }, | ||
139 | 154 | ||
140 | "owner": { | 155 | "owner": { |
141 | "module": "js/components/layout/tools-properties.reel", | 156 | "module": "js/components/layout/tools-properties.reel", |
@@ -191,6 +206,7 @@ | |||
191 | <div id="rotateStageProperties"></div> | 206 | <div id="rotateStageProperties"></div> |
192 | <div id="panProperties"></div> | 207 | <div id="panProperties"></div> |
193 | <div id="zoomProperties"></div> | 208 | <div id="zoomProperties"></div> |
209 | <div id="disabledCondition" class="panelDisabled"></div> | ||
194 | </div> | 210 | </div> |
195 | </body> | 211 | </body> |
196 | </html> | 212 | </html> |