diff options
author | hwc487 | 2012-06-13 14:04:09 -0700 |
---|---|---|
committer | hwc487 | 2012-06-13 14:04:09 -0700 |
commit | 3e481dd581e0305dd8b572ed0d17e86622223464 (patch) | |
tree | aca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/panels/Timeline/TimelinePanel.reel | |
parent | a7aa51e6b91623772eef54b827616432838b560e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 107 |
1 files changed, 100 insertions, 7 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index f7ab5117..cb8185e5 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -10,10 +10,98 @@ var nj = require("js/lib/NJUtils").NJUtils; | |||
10 | 10 | ||
11 | var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | 11 | var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { |
12 | 12 | ||
13 | hasTemplate:{ | 13 | user_layers: { |
14 | value:true | 14 | value: null, |
15 | serializable: true | ||
16 | }, | ||
17 | |||
18 | track_container: { | ||
19 | value: null, | ||
20 | serializable: true | ||
21 | }, | ||
22 | |||
23 | timeline_leftpane: { | ||
24 | value: null, | ||
25 | serializable: true | ||
26 | }, | ||
27 | |||
28 | layer_tracks: { | ||
29 | value: null, | ||
30 | serializable: true | ||
31 | }, | ||
32 | |||
33 | master_track: { | ||
34 | value: null, | ||
35 | serializable: true | ||
36 | }, | ||
37 | |||
38 | time_markers: { | ||
39 | value: null, | ||
40 | serializable: true | ||
41 | }, | ||
42 | |||
43 | playhead: { | ||
44 | value: null, | ||
45 | serializable: true | ||
46 | }, | ||
47 | |||
48 | playheadmarker: { | ||
49 | value: null, | ||
50 | serializable: true | ||
51 | }, | ||
52 | |||
53 | timetext: { | ||
54 | value: null, | ||
55 | serializable: true | ||
56 | }, | ||
57 | |||
58 | timebar: { | ||
59 | value: null, | ||
60 | serializable: true | ||
61 | }, | ||
62 | |||
63 | container_tracks: { | ||
64 | value: null, | ||
65 | serializable: true | ||
15 | }, | 66 | }, |
16 | 67 | ||
68 | end_hottext: { | ||
69 | value: null, | ||
70 | serializable: true | ||
71 | }, | ||
72 | |||
73 | container_layers: { | ||
74 | value: null, | ||
75 | serializable: true | ||
76 | }, | ||
77 | |||
78 | timeline_disabler: { | ||
79 | value: null, | ||
80 | serializable: true | ||
81 | }, | ||
82 | |||
83 | checkable_relative: { | ||
84 | value: null, | ||
85 | serializable: true | ||
86 | }, | ||
87 | |||
88 | checkable_absolute: { | ||
89 | value: null, | ||
90 | serializable: true | ||
91 | }, | ||
92 | |||
93 | checkable_animated: { | ||
94 | value: null, | ||
95 | serializable: true | ||
96 | }, | ||
97 | |||
98 | tl_configbutton: { | ||
99 | value: null, | ||
100 | serializable: true | ||
101 | }, | ||
102 | |||
103 | |||
104 | |||
17 | /* === BEGIN: Models === */ | 105 | /* === BEGIN: Models === */ |
18 | _currentDocument: { | 106 | _currentDocument: { |
19 | value : null | 107 | value : null |
@@ -513,11 +601,13 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
513 | // Store the timeline data in currentDocument... | 601 | // Store the timeline data in currentDocument... |
514 | if (this._boolCacheArrays) { | 602 | if (this._boolCacheArrays) { |
515 | // ... but only if we're supposed to. | 603 | // ... but only if we're supposed to. |
516 | this.application.ninja.currentDocument.tlArrLayers = this.arrLayers; | 604 | if(this.currentDocument) { |
517 | this.application.ninja.currentDocument.tlCurrentSelectedContainer = this.currentDocument.model.domContainer; | 605 | this.application.ninja.currentDocument.tlArrLayers = this.arrLayers; |
518 | this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber; | 606 | this.application.ninja.currentDocument.tlCurrentSelectedContainer = this.currentDocument.model.domContainer; |
519 | this.application.ninja.currentDocument.tlCurrentLayerSelected = this.currentLayerSelected; | 607 | this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber; |
520 | this.application.ninja.currentDocument.tlCurrentLayersSelected = this.currentLayersSelected; | 608 | this.application.ninja.currentDocument.tlCurrentLayerSelected = this.currentLayerSelected; |
609 | this.application.ninja.currentDocument.tlCurrentLayersSelected = this.currentLayersSelected; | ||
610 | } | ||
521 | } | 611 | } |
522 | } | 612 | } |
523 | }, | 613 | }, |
@@ -693,6 +783,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
693 | var i = 0, | 783 | var i = 0, |
694 | tlArrLayersLength = this.application.ninja.currentDocument.tlArrLayers.length; | 784 | tlArrLayersLength = this.application.ninja.currentDocument.tlArrLayers.length; |
695 | 785 | ||
786 | |||
787 | this._ignoreNextContainerChange = true; | ||
788 | |||
696 | // We're reading from the cache, not writing to it. | 789 | // We're reading from the cache, not writing to it. |
697 | this._boolCacheArrays = false; | 790 | this._boolCacheArrays = false; |
698 | for (i = 0; i < tlArrLayersLength; i++) { | 791 | for (i = 0; i < tlArrLayersLength; i++) { |