diff options
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 715 |
1 files changed, 285 insertions, 430 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index a1e320c4..191228af 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,17 @@ 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 | |||
72 | } | 71 | } |
73 | } | 72 | } |
74 | }, | 73 | }, |
75 | 74 | ||
76 | // Set to false to skip array caching array sets in current document | 75 | // Set to false to skip array caching array sets in current document |
77 | _boolCacheArrays : { | 76 | _boolCacheArrays:{ |
78 | value: true | 77 | value:true |
79 | }, | 78 | }, |
80 | 79 | ||
81 | _currentLayerNumber:{ | 80 | _currentLayerNumber:{ |
@@ -95,16 +94,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
95 | }, | 94 | }, |
96 | 95 | ||
97 | _setCurrentLayerNumber:{ | 96 | _setCurrentLayerNumber:{ |
98 | value:function(){ | 97 | value:function () { |
99 | if (this._boolCacheArrays) { | 98 | if (this._boolCacheArrays) { |
100 | this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber; | 99 | this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber; |
101 | } | 100 | } |
102 | } | 101 | } |
103 | }, | 102 | }, |
104 | 103 | ||
104 | // TODO - Remove hash tables | ||
105 | _hashKey:{ | 105 | _hashKey:{ |
106 | value:0 | 106 | value:0 |
107 | }, | 107 | }, |
108 | 108 | ||
109 | hashKey:{ | 109 | hashKey:{ |
110 | get:function () { | 110 | get:function () { |
@@ -119,46 +119,47 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
119 | }, | 119 | }, |
120 | 120 | ||
121 | _setHashKey:{ | 121 | _setHashKey:{ |
122 | value:function(){ | 122 | value:function () { |
123 | if (this._boolCacheArrays) { | 123 | if (this._boolCacheArrays) { |
124 | this.application.ninja.currentDocument.hashKey = this.hashKey; | 124 | this.application.ninja.currentDocument.hashKey = this.hashKey; |
125 | } | 125 | } |
126 | } | 126 | } |
127 | }, | 127 | }, |
128 | 128 | ||
129 | |||
129 | _currentLayerSelected:{ | 130 | _currentLayerSelected:{ |
130 | value: null | 131 | value:null |
131 | }, | 132 | }, |
132 | currentLayerSelected : { | 133 | currentLayerSelected:{ |
133 | get: function() { | 134 | get:function () { |
134 | return this._currentLayerSelected; | 135 | return this._currentLayerSelected; |
135 | }, | 136 | }, |
136 | set: function(newVal) { | 137 | set:function (newVal) { |
137 | this._currentLayerSelected = newVal; | 138 | this._currentLayerSelected = newVal; |
138 | this.application.ninja.currentDocument.tlCurrentLayerSelected = newVal; | 139 | this.application.ninja.currentDocument.tlCurrentLayerSelected = newVal; |
139 | } | 140 | } |
140 | }, | 141 | }, |
141 | 142 | ||
142 | _selectedLayerID:{ | 143 | _selectedLayerID:{ |
143 | value: false | 144 | value:false |
144 | }, | 145 | }, |
145 | selectedLayerID : { | 146 | selectedLayerID:{ |
146 | get: function() { | 147 | get:function () { |
147 | return this._selectedLayerID; | 148 | return this._selectedLayerID; |
148 | }, | 149 | }, |
149 | set: function(newVal) { | 150 | set:function (newVal) { |
150 | if (newVal === false) { | 151 | if (newVal === false) { |
151 | // We are clearing the timeline, so just set the value and return. | 152 | // We are clearing the timeline, so just set the value and return. |
152 | this._selectedLayerID = newVal; | 153 | this._selectedLayerID = newVal; |
153 | return; | 154 | return; |
154 | } | 155 | } |
155 | if (newVal !== this._selectedLayerID) { | 156 | if (newVal !== this._selectedLayerID) { |
156 | var selectIndex = this.getLayerIndexByID(newVal); | 157 | var selectIndex = this.getLayerIndexByID(newVal); |
157 | this._selectedLayerID = newVal; | 158 | this._selectedLayerID = newVal; |
158 | this._captureSelection = true; | 159 | this._captureSelection = true; |
159 | this.selectLayer(selectIndex, true); | 160 | this.selectLayer(selectIndex); |
160 | } | 161 | } |
161 | } | 162 | } |
162 | }, | 163 | }, |
163 | 164 | ||
164 | millisecondsOffset:{ | 165 | millisecondsOffset:{ |
@@ -166,16 +167,16 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
166 | }, | 167 | }, |
167 | 168 | ||
168 | _masterDuration:{ | 169 | _masterDuration:{ |
169 | serializable: true, | 170 | serializable:true, |
170 | value:0 | 171 | value:0 |
171 | }, | 172 | }, |
172 | 173 | ||
173 | masterDuration:{ | 174 | masterDuration:{ |
174 | serializable:true, | 175 | serializable:true, |
175 | get:function(){ | 176 | get:function () { |
176 | return this._masterDuration; | 177 | return this._masterDuration; |
177 | }, | 178 | }, |
178 | set:function(val){ | 179 | set:function (val) { |
179 | this._masterDuration = val; | 180 | this._masterDuration = val; |
180 | this.timebar.style.width = (this._masterDuration / 12) + "px"; | 181 | this.timebar.style.width = (this._masterDuration / 12) + "px"; |
181 | } | 182 | } |
@@ -225,18 +226,18 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
225 | }, | 226 | }, |
226 | 227 | ||
227 | _breadCrumbContainer:{ | 228 | _breadCrumbContainer:{ |
228 | value:null | 229 | value:null |
229 | }, | 230 | }, |
230 | 231 | ||
231 | breadCrumbContainer: { | 232 | breadCrumbContainer:{ |
232 | set: function(value) { | 233 | get:function () { |
233 | if(this._breadCrumbContainer !== value) { | 234 | return this._breadCrumbContainer; |
235 | }, | ||
236 | set:function (value) { | ||
237 | if (this._breadCrumbContainer !== value) { | ||
234 | this._breadCrumbContainer = value; | 238 | this._breadCrumbContainer = value; |
235 | this.LayerBinding(this.application.ninja.currentSelectedContainer); | 239 | this.LayerBinding(this.application.ninja.currentSelectedContainer); |
236 | } | 240 | } |
237 | }, |