diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/layout/document-bar.reel/document-bar.html | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/layout/document-bar.reel/document-bar.html')
| -rwxr-xr-x | js/components/layout/document-bar.reel/document-bar.html | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html index bd13f231..760186ba 100755 --- a/js/components/layout/document-bar.reel/document-bar.html +++ b/js/components/layout/document-bar.reel/document-bar.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/> |
| @@ -13,8 +13,7 @@ | |||
| 13 | <script type="text/montage-serialization"> | 13 | <script type="text/montage-serialization"> |
| 14 | { | 14 | { |
| 15 | "hottext1": { | 15 | "hottext1": { |
| 16 | "module": "js/components/hottextunit.reel", | 16 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
| 17 | "name": "HotTextUnit", | ||
| 18 | "properties": { | 17 | "properties": { |
| 19 | "element": {"#": "zoomControlHT"}, | 18 | "element": {"#": "zoomControlHT"}, |
| 20 | "minValue":25, | 19 | "minValue":25, |
| @@ -47,8 +46,7 @@ | |||
| 47 | }, | 46 | }, |
| 48 | 47 | ||
| 49 | "owner": { | 48 | "owner": { |
| 50 | "module": "js/components/layout/document-bar.reel", | 49 | "prototype": "js/components/layout/document-bar.reel", |
| 51 | "name": "DocumentBar", | ||
| 52 | "properties": { | 50 | "properties": { |
| 53 | "element": {"#": "documentBar"}, | 51 | "element": {"#": "documentBar"}, |
| 54 | "designView": {"#": "design"}, | 52 | "designView": {"#": "design"}, |
| @@ -63,11 +61,11 @@ | |||
| 63 | </head> | 61 | </head> |
| 64 | 62 | ||
| 65 | <body> | 63 | <body> |
| 66 | <div id="documentBar"> | 64 | <div data-montage-id="documentBar"> |
| 67 | <input class="zoomHotText label" id="zoomControlHT"/> | 65 | <input class="zoomHotText label" data-montage-id="zoomControlHT"/> |
| 68 | <span class="design-view disable" id="design">Design View</span> | 66 | <span class="design-view disable" data-montage-id="design">Design View</span> |
| 69 | <span class="code-view disable" id="code">Code View</span> | 67 | <span class="code-view disable" data-montage-id="code">Code View</span> |
| 70 | <div id="disabledCondition" class="panelDisabled"></div> | 68 | <div data-montage-id="disabledCondition" class="panelDisabled"></div> |
| 71 | </div> | 69 | </div> |
| 72 | </body> | 70 | </body> |
| 73 | </html> \ No newline at end of file | 71 | </html> \ No newline at end of file |