diff options
author | Valerio Virgillito | 2012-05-03 15:49:10 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-03 15:49:10 -0700 |
commit | eb17fe1bbd05ad260e8a56918a3b396a03767e04 (patch) | |
tree | 4862d452cc803e69e3e5c8746bb648ff21d62912 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |
parent | 602240c38e0f2c3937d3c7246247e0b59bccab2b (diff) | |
parent | b4975bc0e45783111a1d4efe69a7cc7ac3c72ef0 (diff) | |
download | ninja-eb17fe1bbd05ad260e8a56918a3b396a03767e04.tar.gz |
Merge pull request #191 from imix23ways/TimelineUber
Timeline uber
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 66ef1b97..48818e44 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -16,7 +16,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
16 | 16 | ||
17 | /* === BEGIN: Models === */ | 17 | /* === BEGIN: Models === */ |
18 | _arrLayers:{ | 18 | _arrLayers:{ |
19 | serializable:true, | ||
20 | value:[] | 19 | value:[] |
21 | }, | 20 | }, |
22 | 21 | ||
@@ -47,12 +46,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
47 | 46 | ||
48 | 47 | ||
49 | _layerRepetition:{ | 48 | _layerRepetition:{ |
50 | serializable:true, | ||
51 | value:null | 49 | value:null |
52 | }, | 50 | }, |
53 | 51 | ||
54 | layerRepetition:{ | 52 | layerRepetition:{ |
55 | serializable:true, | ||
56 | get:function () { | 53 | get:function () { |
57 | return this._layerRepetition; | 54 | return this._layerRepetition; |
58 | }, | 55 | }, |
@@ -170,7 +167,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
170 | }, | 167 | }, |
171 | 168 | ||
172 | _masterDuration:{ | 169 | _masterDuration:{ |
173 | serializable:true, | ||
174 | value:0 | 170 | value:0 |
175 | }, | 171 | }, |
176 | 172 | ||
@@ -186,12 +182,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
186 | }, | 182 | }, |
187 | 183 | ||
188 | _trackRepetition:{ | 184 | _trackRepetition:{ |
189 | serializable:true, | ||
190 | value:null | 185 | value:null |
191 | }, | 186 | }, |
192 | 187 | ||
193 | trackRepetition:{ | 188 | trackRepetition:{ |
194 | serializable:true, | ||
195 | get:function () { | 189 | get:function () { |
196 | return this._trackRepetition; | 190 | return this._trackRepetition; |
197 | }, | 191 | }, |
@@ -249,18 +243,15 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
249 | }, | 243 | }, |
250 | 244 | ||
251 | _firstTimeLoaded:{ | 245 | _firstTimeLoaded:{ |
252 | value:true, | 246 | value:true |
253 | writable:true | ||
254 | }, | 247 | }, |
255 | 248 | ||
256 | _captureSelection:{ | 249 | _captureSelection:{ |
257 | value:false, | 250 | value:false |
258 | writable:true | ||
259 | }, | 251 | }, |
260 | 252 | ||
261 | _openDoc:{ | 253 | _openDoc:{ |
262 | value:false, | 254 | value:false |
263 | writable:true | ||
264 | }, | 255 | }, |
265 | 256 | ||
266 | timeMarkerHolder:{ | 257 | timeMarkerHolder:{ |
@@ -724,7 +715,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
724 | // there is a currentDocument. We don't do anything at that time. | 715 | // there is a currentDocument. We don't do anything at that time. |
725 | return; | 716 | return; |
726 | } | 717 | } |
727 | this.application.ninja.currentDocument.setLevel = true; | 718 | // this.application.ninja.currentDocument.setLevel = true; |
728 | this._boolCacheArrays = false; | 719 | this._boolCacheArrays = false; |
729 | this.clearTimelinePanel(); | 720 | this.clearTimelinePanel(); |
730 | this._boolCacheArrays = true; | 721 | this._boolCacheArrays = true; |