aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tools-properties.reel/tools-properties.html
diff options
context:
space:
mode:
authorJonathan Duran2012-06-26 13:28:59 -0700
committerJonathan Duran2012-06-26 13:28:59 -0700
commit42ea74de49cc9f06d8231b99c2ee6c65b0f8a61a (patch)
treead15f365ffae331ae76060a1ebdfc0f0f029725a /js/components/layout/tools-properties.reel/tools-properties.html
parentcdb5af99be5fca15265e4940dd22870f4c5fef4b (diff)
parent87a8b62f71bb72274c3dd1fa389e88c12d482ebb (diff)
downloadninja-42ea74de49cc9f06d8231b99c2ee6c65b0f8a61a.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/components/layout/tools-properties.reel/tools-properties.html')
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html12
1 files changed, 10 insertions, 2 deletions
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index 6b766532..07444010 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.html
+++ b/js/components/layout/tools-properties.reel/tools-properties.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -102,6 +102,12 @@
102 "element": {"#": "zoomProperties"} 102 "element": {"#": "zoomProperties"}
103 } 103 }
104 }, 104 },
105 "bindingProperties": {
106 "prototype": "js/components/tools-properties/binding-properties.reel",
107 "properties": {
108 "element": {"#": "bindingProperties"}
109 }
110 },
105 111
106 "disable": { 112 "disable": {
107 "prototype": "montage/ui/condition.reel", 113 "prototype": "montage/ui/condition.reel",
@@ -134,7 +140,8 @@
134 "eraserProperties": {"@": "eraserProperties"}, 140 "eraserProperties": {"@": "eraserProperties"},
135 "rotateStageProperties": {"@": "rotateStageProperties"}, 141 "rotateStageProperties": {"@": "rotateStageProperties"},
136 "panProperties": {"@": "panProperties"}, 142 "panProperties": {"@": "panProperties"},
137 "zoomProperties": {"@": "zoomProperties"} 143 "zoomProperties": {"@": "zoomProperties"},
144 "bindingProperties": {"@": "bindingProperties"}
138 }, 145 },
139 "bindings": { 146 "bindings": {
140 "currentSelectedTool": { 147 "currentSelectedTool": {
@@ -164,6 +171,7 @@
164 <div data-montage-id="rotateStageProperties"></div> 171 <div data-montage-id="rotateStageProperties"></div>
165 <div data-montage-id="panProperties"></div> 172 <div data-montage-id="panProperties"></div>
166 <div data-montage-id="zoomProperties"></div> 173 <div data-montage-id="zoomProperties"></div>
174 <div data-montage-id="bindingProperties"></div>
167 <div data-montage-id="disabledCondition" class="panelDisabled"></div> 175 <div data-montage-id="disabledCondition" class="panelDisabled"></div>
168 </div> 176 </div>
169 </body> 177 </body>