diff options
| author | Valerio Virgillito | 2012-04-27 14:21:35 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-04-27 14:21:35 -0700 |
| commit | b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8 (patch) | |
| tree | ae45391131c7c5203ae8e0d3470d106d835c8c6b /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |
| parent | 314709dd189807bfc762aa150bb1b29d2ccdf25b (diff) | |
| parent | 6c1aa27b7753bc9007514859b42160fae265740d (diff) | |
| download | ninja-b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8.tar.gz | |
Merge branch 'refs/heads/serialization'
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 1b7132b9..f821ba6f 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.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 | "owner": { | 15 | "owner": { |
| 16 | "module": "js/panels/Timeline/TimelinePanel.reel", | 16 | "prototype": "js/panels/Timeline/TimelinePanel.reel", |
| 17 | "name": "TimelinePanel", | ||
| 18 | "properties": { | 17 | "properties": { |
| 19 | "element": {"#": "timeline_panel"}, | 18 | "element": {"#": "timeline_panel"}, |
| 20 | "user_layers": {"#": "user_layers"}, | 19 | "user_layers": {"#": "user_layers"}, |
| @@ -41,8 +40,7 @@ | |||
| 41 | }, | 40 | }, |
| 42 | 41 | ||
| 43 | "timelineResize" : { | 42 | "timelineResize" : { |
| 44 | "module": "js/panels/Resizer", | 43 | "prototype": "js/panels/Resizer", |
| 45 | "name": "Resizer", | ||
| 46 | "properties": { | 44 | "properties": { |
| 47 | "element": {"#": "layer_resizer"}, | 45 | "element": {"#": "layer_resizer"}, |
| 48 | "panel" : {"#" : "timeline_leftpane"}, | 46 | "panel" : {"#" : "timeline_leftpane"}, |
| @@ -54,8 +52,7 @@ | |||
| 54 | 52 | ||
| 55 | 53 | ||
| 56 | "repetition1": { | 54 | "repetition1": { |
| 57 | "module": "montage/ui/repetition.reel", | 55 | "prototype": "montage/ui/repetition.reel", |
| 58 | "name": "Repetition", | ||
| 59 | "properties": { | 56 | "properties": { |
| 60 | "element": {"#": "container-layers"}, | 57 | "element": {"#": "container-layers"}, |
| 61 | "isSelectionEnabled" : true | 58 | "isSelectionEnabled" : true |
| @@ -69,8 +66,7 @@ | |||
| 69 | } | 66 | } |
| 70 | }, | 67 | }, |
| 71 | "layer" : { | 68 | "layer" : { |
| 72 | "module" : "js/panels/Timeline/Layer.reel", | 69 | "prototype" : "js/panels/Timeline/Layer.reel", |
| 73 | "name" : "Layer", | ||
| 74 | "properties" : { | 70 | "properties" : { |
| 75 | "element": {"#": "container-layer"} | 71 | "element": {"#": "container-layer"} |
| 76 | }, | 72 | }, |
| @@ -89,8 +85,7 @@ | |||
| 89 | }, | 85 | }, |
| 90 | 86 | ||
| 91 | "repetition2" : { | 87 | "repetition2" : { |
| 92 | "module": "montage/ui/repetition.reel", | 88 | "prototype": "montage/ui/repetition.reel", |
| 93 | "name": "Repetition", | ||
| 94 | "properties": { | 89 | "properties": { |
| 95 | "element": {"#": "container-tracks"}, | 90 | "element": {"#": "container-tracks"}, |
| 96 | "isSelectionEnabled" : false | 91 | "isSelectionEnabled" : false |
| @@ -104,8 +99,7 @@ | |||
| 104 | } | 99 | } |
| 105 | }, | 100 | }, |
| 106 | "track" : { | 101 | "track" : { |
| 107 | "module" : "js/panels/Timeline/TimelineTrack.reel", | 102 | "prototype" : "js/panels/Timeline/TimelineTrack.reel", |
| 108 | "name" : "TimelineTrack", | ||
| 109 | "properties" : { | 103 | "properties" : { |
| 110 | "element": {"#": "container-track"} | 104 | "element": {"#": "container-track"} |
| 111 | }, | 105 | }, |
| @@ -142,8 +136,7 @@ | |||
| 142 | }, | 136 | }, |
| 143 | 137 | ||
| 144 | "endHottext" : { | 138 | "endHottext" : { |
| 145 | "module": "js/components/hottextunit.reel", | 139 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
| 146 | "name": "HotTextUnit", | ||
| 147 | "properties": { | 140 | "properties": { |
| 148 | "element": {"#": "end_hottext"}, | 141 | "element": {"#": "end_hottext"}, |
| 149 | "maxValue" : 100000, | 142 | "maxValue" : 100000, |