diff options
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 55 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 1268 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 678 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/images/icon-checkmark.png | bin | 0 -> 1083 bytes | |||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/images/icon-gear.png | bin | 0 -> 1397 bytes | |||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss | 370 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/scss/config.rb | 10 |
7 files changed, 1485 insertions, 896 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 14c5f1c8..09c1f98c 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
@@ -19,11 +19,9 @@ | |||
19 | "element": {"#": "timeline_panel"}, | 19 | "element": {"#": "timeline_panel"}, |
20 | "user_layers": {"#": "user_layers"}, | 20 | "user_layers": {"#": "user_layers"}, |
21 | "track_container": {"#": "right_inside"}, | 21 | "track_container": {"#": "right_inside"}, |
22 | "timeline_leftpane" : {"#" : "timeline_leftpane"}, | 22 | "timeline_leftpane" : {"#" : "leftpane_inside"}, |
23 | "layer_tracks": {"#": "layer_tracks"}, | 23 | "layer_tracks": {"#": "layer_tracks"}, |
24 | "master_track": {"#": "master_track"}, | 24 | "master_track": {"#": "master_track"}, |
25 | "newlayer_button": {"#": "newlayer_button"}, | ||
26 | "deletelayer_button": {"#": "deletelayer_button"}, | ||
27 | "time_markers" : {"#": "timeline_markers"}, | 25 | "time_markers" : {"#": "timeline_markers"}, |
28 | "layerRepetition" : {"@": "repetition1"}, | 26 | "layerRepetition" : {"@": "repetition1"}, |
29 | "trackRepetition" : {"@" : "repetition2"}, | 27 | "trackRepetition" : {"@" : "repetition2"}, |
@@ -34,7 +32,10 @@ | |||
34 | "container_tracks" : {"#" : "container-tracks"}, | 32 | "container_tracks" : {"#" : "container-tracks"}, |
35 | "end_hottext" : {"@" : "endHottext"}, | 33 | "end_hottext" : {"@" : "endHottext"}, |
36 | "container_layers" : {"#" : "container-layers"}, | 34 | "container_layers" : {"#" : "container-layers"}, |
37 | "timeline_disabler" : {"#" : "timeline-disabler"} | 35 | "timeline_disabler" : {"#" : "timeline-disabler"}, |
36 | "checkable_relative" : {"#" : "checkable_relative"}, | ||
37 | "checkable_absolute" : {"#" : "checkable_absolute"}, | ||
38 | "checkable_animated" : {"#" : "checkable_animated"} | ||
38 | } | 39 | } |
39 | }, | 40 | }, |
40 | 41 | ||
@@ -77,7 +78,12 @@ | |||
77 | "boundObject" : {"@" : "repetition1"}, | 78 | "boundObject" : {"@" : "repetition1"}, |
78 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", | 79 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", |
79 | "oneway" : false | 80 | "oneway" : false |
80 | } | 81 | }, |
82 | "bindingPoint" : { | ||
83 | "boundObject" : {"@" : "repetition1"}, | ||
84 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding", | ||
85 | "oneway" : false | ||
86 | } | ||
81 | } | 87 | } |
82 | }, | 88 | }, |
83 | 89 | ||
@@ -107,9 +113,33 @@ | |||
107 | "boundObject" : {"@" : "repetition2"}, | 113 | "boundObject" : {"@" : "repetition2"}, |
108 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", | 114 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData", |
109 | "oneway" : false | 115 | "oneway" : false |
116 | }, | ||
117 | "bindingPoint" : { | ||
118 | "boundObject" : {"@" : "repetition2"}, | ||
119 | "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding", | ||
120 | "oneway" : false | ||
110 | } | 121 | } |
122 | |||
111 | } | 123 | } |
112 | }, | 124 | }, |
125 | |||
126 | "timelineZoomSlider":{ | ||
127 | "module":"js/components/slider.reel", | ||
128 | "name":"Slider", | ||
129 | "properties":{ | ||
130 | "element":{"#":"tl_slider"}, | ||
131 | "maxValue" : 10000, | ||
132 | "minValue" : 1000 | ||
133 | }, | ||
134 | "bindings": { | ||
135 | "value": { | ||
136 | "boundObject": {"@": "owner"}, | ||
137 | "boundObjectPropertyPath": "millisecondsOffset", | ||
138 | "oneway": false | ||
139 | } | ||
140 | } | ||
141 | }, | ||
142 | |||
113 | "endHottext" : { | 143 | "endHottext" : { |
114 | "module": "js/components/hottextunit.reel", | 144 | "module": "js/components/hottextunit.reel", |
115 | "name": "HotTextUnit", | 145 | "name": "HotTextUnit", |
@@ -152,15 +182,22 @@ | |||
152 | <div id="user_layers" class="userlayers"> | 182 | <div id="user_layers" class="userlayers"> |
153 | <div id="master_layer" class="masterlayer"> | 183 | <div id="master_layer" class="masterlayer"> |
154 | <div>Master Layer</div> | 184 | <div>Master Layer</div> |
185 | <div class="tl-configbutton"> | ||
186 | <div class="tl-dropdown"> | ||
187 | <div class="checkable checked" data-montage-id="checkable_relative">Use relative positioning</div> | ||
188 | <div class="checkable" data-montage-id="checkable_absolute">Use absolute positioning</div> | ||
189 | <div class="nj-divider divider-horizontal"></div> | ||
190 | <div class="checkable" data-montage-id="checkable_animated">Show only animated layers</div> | ||
191 | </div> | ||
192 | </div> | ||
155 | </div> | 193 | </div> |
156 | <div id="container-layers"> | 194 | <div id="container-layers" style="position: relative;" class="container-layers"> |
157 | <div id="container-layer"></div> | 195 | <div id="container-layer"></div> |
158 | </div> | 196 | </div> |
159 | </div> | 197 | </div> |
160 | 198 | ||
161 | <div id="timeline_gutter" class="timelinegutter"> | 199 | <div id="timeline_gutter" class="timelinegutter"> |
162 | <div id="newlayer_button" class="newlayerbutton"></div> | 200 | <div id="tl_slider" class="tl_slider"></div> |
163 | <div id="deletelayer_button" class="deletelayerbutton"></div> | ||
164 | <input id="end_hottext" class="endhottext"> | 201 | <input id="end_hottext" class="endhottext"> |
165 | </div> | 202 | </div> |
166 | </div> | 203 | </div> |
@@ -197,4 +234,4 @@ | |||
197 | </div> | 234 | </div> |
198 | 235 | ||
199 | </body> | 236 | </body> |
200 | </html> \ No newline at end of file | 237 | </html> |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 033d0f79..39d1ffc6 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -19,12 +19,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
19 | 19 | ||
20 | /* === BEGIN: Models === */ | 20 | /* === BEGIN: Models === */ |
21 | _arrLayers:{ | 21 | _arrLayers:{ |
22 | serializable: true, | 22 | serializable:true, |
23 | value:[] | 23 | value:[] |
24 | }, | 24 | }, |
25 | 25 | ||
26 | arrLayers:{ | 26 | arrLayers:{ |
27 | serializable: true, | 27 | serializable:true, |
28 | get:function () { | 28 | get:function () { |
29 | return this._arrLayers; | 29 | return this._arrLayers; |
30 | }, | 30 | }, |
@@ -50,12 +50,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
50 | 50 | ||
51 | 51 | ||
52 | _layerRepetition:{ | 52 | _layerRepetition:{ |
53 | serializable: true, | 53 | serializable:true, |
54 | value:null | 54 | value:null |
55 | }, | 55 | }, |
56 | 56 | ||
57 | layerRepetition:{ | 57 | layerRepetition:{ |
58 | serializable: true, | 58 | serializable:true, |
59 | get:function () { | 59 | get:function () { |
60 | return this._layerRepetition; | 60 | return this._layerRepetition; |
61 | }, | 61 | }, |
@@ -64,18 +64,18 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
64 | } | 64 | } |
65 | }, | 65 | }, |
66 | 66 | ||
67 | _cacheArrays : { | 67 | _cacheArrays:{ |
68 | value: function() { | 68 | value:function () { |
69 | if (this._boolCacheArrays) { | 69 | if (this._boolCacheArrays) { |
70 | this.application.ninja.currentDocument.tlArrLayers = this.arrLayers; | 70 | this.application.ninja.currentDocument.tlArrLayers = this.arrLayers; |
71 | 71 | this.application.ninja.currentDocument.tlCurrentSelectedContainer=this.application.ninja.currentSelectedContainer; | |
72 | } | 72 | } |
73 | } | 73 | } |
74 | }, | 74 | }, |
75 | 75 | ||
76 | // Set to false to skip array caching array sets in current document | 76 | // Set to false to skip array caching array sets in current document |
77 | _boolCacheArrays : { | 77 | _boolCacheArrays:{ |
78 | value: true | 78 | value:true |
79 | }, | 79 | }, |
80 | 80 | ||
81 | _currentLayerNumber:{ | 81 | _currentLayerNumber:{ |
@@ -95,87 +95,86 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
95 | }, | 95 | }, |
96 |