diff options
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
4 files changed, 724 insertions, 619 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index f6fae9b8..57285704 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
@@ -1,9 +1,33 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | All Rights Reserved. |
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 5 | BSD License. |
6 | </copyright> --> | 6 | |
7 | Redistribution and use in source and binary forms, with or without | ||
8 | modification, are permitted provided that the following conditions are met: | ||
9 | |||
10 | - Redistributions of source code must retain the above copyright notice, | ||
11 | this list of conditions and the following disclaimer. | ||
12 | - Redistributions in binary form must reproduce the above copyright | ||
13 | notice, this list of conditions and the following disclaimer in the | ||
14 | documentation and/or other materials provided with the distribution. | ||
15 | - Neither the name of Motorola Mobility nor the names of its contributors | ||
16 | may be used to endorse or promote products derived from this software | ||
17 | without specific prior written permission. | ||
18 | |||
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
26 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
27 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
28 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
29 | POSSIBILITY OF SUCH DAMAGE. | ||
30 | </copyright> --> | ||
7 | <html lang="en"> | 31 | <html lang="en"> |
8 | <head> | 32 | <head> |
9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 7deaf0d1..93b4d67e 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -1,8 +1,32 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 2 | Copyright (c) 2012, Motorola Mobility, Inc |
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 3 | All Rights Reserved. |
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | BSD License. |
5 | </copyright> */ | 5 | |
6 | Redistribution and use in source and binary forms, with or without | ||
7 | modification, are permitted provided that the following conditions are met: | ||
8 | |||
9 | - Redistributions of source code must retain the above copyright notice, | ||
10 | this list of conditions and the following disclaimer. | ||
11 | - Redistributions in binary form must reproduce the above copyright | ||
12 | notice, this list of conditions and the following disclaimer in the | ||
13 | documentation and/or other materials provided with the distribution. | ||
14 | - Neither the name of Motorola Mobility nor the names of its contributors | ||
15 | may be used to endorse or promote products derived from this software | ||
16 | without specific prior written permission. | ||
17 | |||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
25 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
26 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
27 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
28 | POSSIBILITY OF SUCH DAMAGE. | ||
29 | </copyright> */ | ||
6 | 30 | ||
7 | var Montage = require("montage/core/core").Montage, | 31 | var Montage = require("montage/core/core").Montage, |
8 | Component = require("montage/ui/component").Component, | 32 | Component = require("montage/ui/component").Component, |
@@ -11,103 +35,244 @@ var Montage = require("montage/core/core").Montage, | |||
11 | 35 | ||
12 | var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | 36 | var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { |
13 | 37 | ||
38 | /* === BEGIN: Models === */ | ||
39 | _user_layers: { | ||
40 | value: null | ||
41 | }, | ||
14 | user_layers: { | 42 | user_layers: { |
15 | value: null, | 43 | serializable: true, |
16 | serializable: true | 44 | get: function() { |
45 | return this._user_layers; | ||
46 | }, | ||
47 | set: function(newVal) { | ||
48 | this._user_layers = newVal; | ||
49 | } | ||
17 | }, | 50 | }, |
18 | 51 | ||
52 | _track_container: { | ||
53 | value: null | ||
54 | }, | ||
19 | track_container: { | 55 | track_container: { |
20 | value: null, | 56 | serializable: true, |
21 | serializable: true | 57 | get: function() { |
58 | return this._track_container; | ||
59 | }, | ||
60 | set: function(newVal) { | ||
61 | this._track_container = newVal; | ||
62 | } | ||
22 | }, | 63 | }, |
23 | 64 | ||
65 | _timeline_leftpane: { | ||
66 | value: null | ||
67 | }, | ||
24 | timeline_leftpane: { | 68 | timeline_leftpane: { |
25 | value: null, | 69 | serializable: true, |
26 | serializable: true | 70 | get: function() { |
71 | return this._timeline_leftpane; | ||
72 | }, | ||
73 | set: function(newVal) { | ||
74 | this._timeline_leftpane = newVal; | ||
75 | } | ||
27 | }, | 76 | }, |
28 | 77 | ||
78 | _layer_tracks: { | ||
79 | value: null | ||
80 | }, | ||
29 | layer_tracks: { | 81 | layer_tracks: { |
30 | value: null, | 82 | serializable: true, |
31 | serializable: true | 83 | get: function() { |
84 | return this._layer_tracks; | ||
85 | }, | ||
86 | set: function(newVal) { | ||
87 | this._layer_tracks = newVal; | ||
88 | } | ||
32 | }, | 89 | }, |
33 | 90 | ||
91 | _master_track: { | ||
92 | value: null | ||
93 | }, | ||
34 | master_track: { | 94 | master_track: { |
35 | value: null, | 95 | serializable: true, |
36 | serializable: true | 96 | get: function() { |
97 | return this._master_track; | ||
98 | }, | ||
99 | set: function(newVal) { | ||
100 | this._master_track = newVal; | ||
101 | } | ||
37 | }, | 102 | }, |
38 | 103 | ||
104 | _time_markers: { | ||
105 | value: null | ||
106 | }, | ||
39 | time_markers: { | 107 | time_markers: { |
40 | value: null, | 108 | serializable: true, |
41 | serializable: true | 109 | get: function() { |
110 | return this._time_markers; | ||
111 | }, | ||
112 | set: function(newVal) { | ||
113 | this._time_markers = newVal; | ||
114 | } | ||
42 | }, | 115 | }, |
43 | 116 | ||
117 | _playhead: { | ||
118 | value: null | ||
119 | }, | ||
44 | playhead: { | 120 | playhead: { |
45 | value: null, | 121 | serializable: true, |
46 | serializable: true | 122 | get: function() { |
123 | return this._playhead; | ||
124 | }, | ||
125 | set: function(newVal) { | ||
126 | this._playhead = newVal; | ||
127 | } | ||
47 | }, | 128 | }, |
48 | 129 | ||
130 | _playheadmarker: { | ||
131 | value: null | ||
132 | }, | ||
49 | playheadmarker: { | 133 | playheadmarker: { |
50 | value: null, | 134 | serializable: true, |
51 | serializable: true | 135 | get: function() { |
136 | return this._playheadmarker; | ||
137 | }, | ||
138 | set: function(newVal) { | ||
139 | this._playheadmarker = newVal; | ||
140 | } | ||
52 | }, | 141 | }, |
53 | 142 | ||
143 | _timetext: { | ||
144 |