diff options
| author | Jon Reid | 2012-06-26 14:58:10 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-26 14:58:10 -0700 |
| commit | 2599f74d72293b809929d8a0b36fb8e721f194cd (patch) | |
| tree | ca4cd45b23b8debea32f95d7dea807c77b6633b2 /js/components/layout/tools-properties.reel | |
| parent | ab9d14780eed98f39786fae4518e69861b34bad7 (diff) | |
| parent | e4304b9ac6c58802de4dd334be1f5802533f5160 (diff) | |
| download | ninja-2599f74d72293b809929d8a0b36fb8e721f194cd.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/components/layout/tools-properties.reel')
| -rwxr-xr-x | js/components/layout/tools-properties.reel/tools-properties.html | 12 |
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> |