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/panels/presets/content.reel | |
| 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/panels/presets/content.reel')
| -rw-r--r-- | js/panels/presets/content.reel/content.html | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html index afbdd559..50a48389 100644 --- a/js/panels/presets/content.reel/content.html +++ b/js/panels/presets/content.reel/content.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/> |
| @@ -11,8 +11,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "owner": { | 13 | "owner": { |
| 14 | "module" : "js/panels/presets/content.reel", | 14 | "prototype" : "js/panels/presets/content.reel", |
| 15 | "name" : "Content", | ||
| 16 | "properties" : { | 15 | "properties" : { |
| 17 | "element" : {"#" : "presetsPanel"}, | 16 | "element" : {"#" : "presetsPanel"}, |
| 18 | "activeTabIndex": 0, | 17 | "activeTabIndex": 0, |
| @@ -25,8 +24,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 25 | } | 24 | } |
| 26 | }, | 25 | }, |
| 27 | "substitution": { | 26 | "substitution": { |
| 28 | "module": "montage/ui/substitution.reel", | 27 | "prototype": "montage/ui/substitution.reel", |
| 29 | "name": "Substitution", | ||
| 30 | "properties": { | 28 | "properties": { |
| 31 | "element": {"#": "librarySlot"}, | 29 | "element": {"#": "librarySlot"}, |
| 32 | "switchComponents": { | 30 | "switchComponents": { |
| @@ -44,29 +42,26 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 44 | } | 42 | } |
| 45 | }, | 43 | }, |
| 46 | "stylesLibrary": { | 44 | "stylesLibrary": { |
| 47 | "module": "js/panels/presets/style-presets.reel", | 45 | "prototype": "js/panels/presets/style-presets.reel[StylesLibrary]" |
| 48 | "name": "StylesLibrary" | ||
| 49 | }, | 46 | }, |
| 50 | "transitionsLibrary": { | 47 | "transitionsLibrary": { |
| 51 | "module": "js/panels/presets/transitions-presets.reel", | 48 | "prototype": "js/panels/presets/transitions-presets.reel[TransitionsLibrary]" |
| 52 | "name": "TransitionsLibrary" | ||
| 53 | }, | 49 | }, |
| 54 | "animationsLibrary": { | 50 | "animationsLibrary": { |
| 55 | "module": "js/panels/presets/animations-presets.reel", | 51 | "prototype": "js/panels/presets/animations-presets.reel[AnimationsLibrary]" |
| 56 | "name": "AnimationsLibrary" | ||
| 57 | } | 52 | } |
| 58 | 53 | ||
| 59 | } | 54 | } |
| 60 | </script> | 55 | </script> |
| 61 | </head> | 56 | </head> |
| 62 | <body> | 57 | <body> |
| 63 | <section id="presetsPanel" class="presetsPanel"> | 58 | <section data-montage-id="presetsPanel" class="presetsPanel"> |
| 64 | <nav id="tab-bar" class="tab-bar"> | 59 | <nav data-montage-id="tab-bar" class="tab-bar"> |
| 65 | <div id="styles">Styles</div> | 60 | <div data-montage-id="styles">Styles</div> |
| 66 | <div id="transitions">Transitions</div> | 61 | <div data-montage-id="transitions">Transitions</div> |
| 67 | <div id="animations">Animations</div> | 62 | <div data-montage-id="animations">Animations</div> |
| 68 | </nav> | 63 | </nav> |
| 69 | <div id="librarySlot" class="librarySlot"></div> | 64 | <div data-montage-id="librarySlot" class="librarySlot"></div> |
| 70 | </section> | 65 | </section> |
| 71 | </body> | 66 | </body> |
| 72 | </html> \ No newline at end of file | 67 | </html> \ No newline at end of file |