aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tools-properties.reel/tools-properties.html
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-13 09:23:51 -0700
committerNivesh Rajbhandari2012-03-13 09:23:51 -0700
commit970c2e63aa8ec3f70df2bf073cedb9e3b7617755 (patch)
tree73454125161118363e4de8f25bbc638d997dbd82 /js/components/layout/tools-properties.reel/tools-properties.html
parent2ac9a855724cc4ccf147ce4130a733a84cc647c3 (diff)
parentc24f58c10231c30d3a8a4c9fb9a4f395dd746180 (diff)
downloadninja-970c2e63aa8ec3f70df2bf073cedb9e3b7617755.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/components/layout/tools-properties.reel/tools-properties.html')
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html16
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>