diff options
author | Jose Antonio Marquez | 2012-03-14 15:17:01 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-14 15:17:01 -0700 |
commit | e7e18f02870a0cfe06e550acf8ffef6eab945231 (patch) | |
tree | c940a63fd47e60f121c42b1823194522c8c2820f /js/components/layout/tools-properties.reel/tools-properties.html | |
parent | ef601b13a2529c207eb782942e918212e5a0805e (diff) | |
parent | 089534a80c64226bf7d124ab9147afce386fdb5c (diff) | |
download | ninja-e7e18f02870a0cfe06e550acf8ffef6eab945231.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
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> |