diff options
author | Valerio Virgillito | 2012-07-18 11:29:32 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-18 11:29:32 -0700 |
commit | 490b44befa8842b3013a06b8d3f176db0d095bbf (patch) | |
tree | 77aadc31c173ebc12426bff5fa28c86d53205305 /js/panels/Timeline/TimelinePanel.reel | |
parent | 569a005bdd45ac9d4eda95c64eb7e4af78fb196e (diff) | |
parent | c075d1ce399dabe270214e1fe707be55d2e28c0c (diff) | |
download | ninja-490b44befa8842b3013a06b8d3f176db0d095bbf.tar.gz |
Merge branch 'TimelineUber' of https://github.com/imix23ways/ninja into v0.7.1
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 2 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 2854 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 115 | ||||
-rwxr-xr-x | js/panels/Timeline/TimelinePanel.reel/images/knob.png | bin | 0 -> 1036 bytes | |||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss | 27 |
5 files changed, 1528 insertions, 1470 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 6c5e030c..c287e68e 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
@@ -217,7 +217,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
217 | </div> | 217 | </div> |
218 | 218 | ||
219 | <div data-montage-id="timeline_gutter" class="timelinegutter"> | 219 | <div data-montage-id="timeline_gutter" class="timelinegutter"> |
220 | <div class="sliderClass"> | ||
220 | <div data-montage-id="tl_slider" class="tl_slider"></div> | 221 | <div data-montage-id="tl_slider" class="tl_slider"></div> |
222 | </div> | ||
221 | <input data-montage-id="end_hottext" class="endhottext"> | 223 | <input data-montage-id="end_hottext" class="endhottext"> |
222 | </div> | 224 | </div> |
223 | </div> | 225 | </div> |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index a1e03b35..6cc08cdf 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -1,25 +1,24 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility LLC. | 2 | Copyright (c) 2012, Motorola Mobility, Inc |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
4 | 5 | ||
5 | Redistribution and use in source and binary forms, with or without | 6 | Redistribution and use in source and binary forms, with or without |
6 | modification, are permitted provided that the following conditions are met: | 7 | modification, are permitted provided that the following conditions are met: |
7 | 8 | ||
8 | * Redistributions of source code must retain the above copyright notice, | 9 | - Redistributions of source code must retain the above copyright notice, |
9 | this list of conditions and the following disclaimer. | 10 | this list of conditions and the following disclaimer. |
10 | 11 | - Redistributions in binary form must reproduce the above copyright | |
11 | * Redistributions in binary form must reproduce the above copyright notice, | 12 | notice, this list of conditions and the following disclaimer in the |
12 | this list of conditions and the following disclaimer in the documentation | 13 | documentation and/or other materials provided with the distribution. |
13 | and/or other materials provided with the distribution. | 14 | - Neither the name of Motorola Mobility nor the names of its contributors |
14 | 15 | may be used to endorse or promote products derived from this software | |
15 | * Neither the name of Motorola Mobility LLC nor the names of its | 16 | without specific prior written permission. |
16 | contributors may be used to endorse or promote products derived from this | ||
17 | software without specific prior written permission. | ||
18 | 17 | ||
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 18 | 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 | 19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | 21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE |
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -30,109 +29,250 @@ POSSIBILITY OF SUCH DAMAGE. | |||
30 | </copyright> */ | 29 | </copyright> */ |
31 | 30 | ||
32 | var Montage = require("montage/core/core").Montage, | 31 | var Montage = require("montage/core/core").Montage, |
33 | Component = require("montage/ui/component").Component, | 32 | Component = require("montage/ui/component").Component, |
34 | nj = require("js/lib/NJUtils").NJUtils, | 33 | nj = require("js/lib/NJUtils").NJUtils, |
35 | EasingMenuPopup = require("js/panels/Timeline/EasingMenu.reel").EasingMenu; | 34 | EasingMenuPopup = require("js/panels/Timeline/EasingMenu.reel").EasingMenu; |
36 | 35 | ||
37 | var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | 36 | var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { |
38 | 37 | ||
38 | /* === BEGIN: Models === */ | ||
39 | _user_layers: { | ||
40 | value: null | ||
41 | }, | ||
39 | user_layers: { | 42 | user_layers: { |
40 | value: null, | 43 | serializable: true, |
41 | serializable: true | 44 | get: function() { |
45 | return this._user_layers; | ||
46 | }, | ||
47 | set: function(newVal) { | ||
48 | this._user_layers = newVal; | ||
49 | } | ||
42 | }, | 50 | }, |
43 | 51 | ||
52 | _track_container: { | ||
53 | value: null | ||
54 | }, | ||
44 | track_container: { | 55 | track_container: { |
45 | value: null, | 56 | serializable: true, |
46 | serializable: true | 57 | get: function() { |
58 | return this._track_container; | ||
59 | }, | ||
60 | set: function(newVal) { | ||
61 | this._track_container = newVal; | ||
62 | } | ||
47 | }, | 63 | }, |
48 | 64 | ||
65 | _timeline_leftpane: { | ||
66 | value: null | ||
67 | }, | ||
49 | timeline_leftpane: { | 68 | timeline_leftpane: { |
50 | value: null, | 69 | serializable: true, |
51 | serializable: true | 70 | get: function() { |
71 | return this._timeline_leftpane; | ||
72 | }, | ||
73 | set: function(newVal) { | ||
74 | this._timeline_leftpane = newVal; | ||
75 | } | ||
52 | }, | 76 | }, |
53 | 77 | ||
78 | _layer_tracks: { | ||
79 | value: null | ||
80 | }, | ||
54 | layer_tracks: { | 81 | layer_tracks: { |
55 | value: null, | 82 | serializable: true, |
56 | serializable: true | 83 | get: function() { |
84 | return this._layer_tracks; | ||
85 | }, | ||
86 | set: function(newVal) { | ||
87 | this._layer_tracks = newVal; | ||
88 | } | ||
57 | }, | 89 | }, |
58 | 90 | ||
91 | _master_track: { | ||
92 | value: null | ||
93 | }, | ||
59 | master_track: { | 94 | master_track: { |
60 | value: null, | 95 | serializable: true, |
61 | serializable: true | 96 | get: function() { |
97 | return this._master_track; | ||
98 | }, | ||
99 | set: function(newVal) { | ||
100 | this._master_track = newVal; | ||
101 | } | ||
62 | }, | 102 | }, |
63 | 103 | ||
104 | _time_markers: { | ||
105 | value: null | ||
106 | }, | ||
64 | time_markers: { | 107 | time_markers: { |
65 | value: null, | 108 | serializable: true, |
66 | serializable: true | 109 | get: function() { |
110 | return this._time_markers; | ||
111 | }, | ||
112 | set: function(newVal) { | ||
113 | this._time_markers = newVal; | ||
114 | } | ||
67 | }, | 115 | }, |
68 | 116 | ||
117 | _playhead: { | ||
118 | value: null | ||
119 | }, | ||
69 | playhead: { | 120 | playhead: { |
70 | value: null, | 121 | serializable: true, |
71 | serializable: true | 122 | get: function() { |
123 | return this._playhead; | ||
124 | }, | ||
125 | set: function(newVal) { | ||
126 | this._playhead = newVal; | ||
127 | } | ||
72 | }, | 128 | }, |
73 | 129 | ||
130 | _playheadmarker: { | ||
131 | value: null | ||
132 | }, | ||
74 | playheadmarker: { | 133 | playheadmarker: { |
75 | value: null, | 134 | serializable: true, |
76 | serializable: true | 135 | get: function() { |
136 | return this._playheadmarker; | ||
137 | }, | ||
138 | set: function(newVal) { | ||
139 | this._playheadmarker = newVal; | ||
140 | } | ||
77 | }, | 141 | }, |
78 | 142 | ||
143 | _timetext: { | ||
144 | value: null | ||
145 | }, | ||
79 | timetext: { | 146 | timetext: { |
80 | value: null, |