diff options
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.js')
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 221 |
1 files changed, 82 insertions, 139 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index f2e20d41..b0f6d220 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
@@ -36,13 +36,10 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
36 | 36 | ||
37 | /* Style models: the array of styles, and the repetition that uses them */ | 37 | /* Style models: the array of styles, and the repetition that uses them */ |
38 | _arrLayerStyles : { | 38 | _arrLayerStyles : { |
39 | serializable: true, | ||
40 | enumerable: true, | ||
41 | value: [] | 39 | value: [] |
42 | }, | 40 | }, |
43 | arrLayerStyles : { | 41 | arrLayerStyles : { |
44 | serializable: true, | 42 | serializable: true, |
45 | enumerable: true, | ||
46 | get: function() { | 43 | get: function() { |
47 | return this._arrLayerStyles; | 44 | return this._arrLayerStyles; |
48 | }, | 45 | }, |
@@ -54,6 +51,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
54 | value: false | 51 | value: false |
55 | }, | 52 | }, |
56 | styleRepetition : { | 53 | styleRepetition : { |
54 | serializable: true, | ||
57 | get: function() { | 55 | get: function() { |
58 | return this._styleRepetition; | 56 | return this._styleRepetition; |
59 | }, | 57 | }, |
@@ -64,8 +62,17 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
64 | _styleCounter : { | 62 | _styleCounter : { |
65 | value: 0 | 63 | value: 0 |
66 | }, | 64 | }, |
65 | styleCounter:{ | ||
66 | serializable:true, | ||
67 | get:function () { | ||
68 | return this._styleCounter; | ||
69 | }, | ||
70 | set:function (newVal) { | ||
71 | this._styleCounter = newVal; | ||
72 | } | ||
73 | }, | ||
67 | 74 | ||
68 | /* Layer models: the name, ID, and selected and animation booleans for the layer */ | 75 | /* Layer models: the name, ID, and selected and animation booleans for the layer */ |
69 | _layerName:{ | 76 | _layerName:{ |
70 | value: "Default Layer Name" | 77 | value: "Default Layer Name" |
71 | }, | 78 | }, |
@@ -76,13 +83,13 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
76 | return this._layerName; | 83 | return this._layerName; |
77 | }, | 84 | }, |
78 | set:function(newVal){ | 85 | set:function(newVal){ |
79 | |||
80 | this._layerEditable.value = newVal; | 86 | this._layerEditable.value = newVal; |
81 | this._layerName = newVal; | 87 | this._layerName = newVal; |
82 | this.layerData.layerName = newVal; | 88 | this.layerData.layerName = newVal; |
83 | if (typeof(this.dynamicLayerName) !== "undefined") { | 89 | if (typeof(this.dynamicLayerName) !== "undefined") { |
84 | this.dynamicLayerName.value = newVal; | 90 | this.dynamicLayerName.value = newVal; |
85 | } | 91 | } |
92 | |||
86 | } | 93 | } |
87 | }, | 94 | }, |
88 | _layerID:{ | 95 | _layerID:{ |
@@ -140,10 +147,9 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
140 | } | 147 | } |
141 | }, | 148 | }, |
142 | 149 | ||
143 | /* Position and Transform hottext values */ | 150 | /* Position and Size hottext values */ |
144 | _dtextPositionX : { | 151 | _dtextPositionX : { |
145 | value:null, | 152 | value:null |
146 | serializable: true | ||
147 | }, | 153 | }, |
148 | 154 | ||
149 | dtextPositionX:{ | 155 | dtextPositionX:{ |
@@ -161,8 +167,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
161 | }, | 167 | }, |
162 | 168 | ||
163 | _dtextPositionY : { | 169 | _dtextPositionY : { |
164 | value:null, | 170 | value:null |
165 | serializable: true | ||
166 | }, | 171 | }, |
167 | 172 | ||
168 | dtextPositionY:{ | 173 | dtextPositionY:{ |
@@ -180,8 +185,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
180 | }, | 185 | }, |
181 | 186 | ||
182 | _dtextScaleX : { | 187 | _dtextScaleX : { |
183 | value:null, | 188 | value:null |
184 | serializable: true | ||
185 | }, | 189 | }, |
186 | 190 | ||
187 | dtextScaleX:{ | 191 | dtextScaleX:{ |
@@ -199,8 +203,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
199 | }, | 203 | }, |
200 | 204 | ||
201 | _dtextScaleY : { | 205 | _dtextScaleY : { |
202 | value:null, | 206 | value:null |
203 | serializable: true | ||
204 | }, | 207 | }, |
205 | 208 | ||
206 | dtextScaleY:{ | 209 | dtextScaleY:{ |
@@ -217,69 +220,9 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
217 | } | 220 | } |
218 | }, | 221 | }, |
219 | 222 | ||
220 | _dtextSkewX : { | ||
221 | value:null, | ||
222 | serializable: true | ||
223 | }, | ||
224 | |||
225 | dtextSkewX:{ | ||
226 | serializable: true, | ||
227 | get:function(){ | ||
228 | return this._dtextSkewX; | ||
229 | }, | ||
230 | set:function(value){ | ||
231 | if (this._dtextSkewX !== value) { | ||
232 | this._dtextSkewX = value; | ||
233 | this.layerData.dtextSkewX = value; | ||
234 | } | ||
235 | |||
236 | } | ||
237 | }, | ||
238 | |||
239 | _dtextSkewY : { | ||
240 | value:null, | ||
241 | serializable: true | ||
242 | }, | ||
243 | |||
244 | dtextSkewY:{ | ||
245 | serializable: true, | ||
246 | get:function(){ | ||
247 | return this._dtextSkewY; | ||
248 | }, | ||
249 | set:function(value){ | ||
250 | if (this._dtextSkewY !== value) { | ||
251 | this._dtextSkewY = value; | ||
252 | this.layerData.dtextSkewY = value; | ||
253 | } | ||
254 | |||
255 | } | ||
256 | }, | ||
257 | |||
258 | _dtextRotate : { | ||
259 | value:null, | ||
260 | serializable: true | ||
261 | }, | ||
262 | |||
263 | dtextRotate:{ | ||
264 | serializable: true, | ||
265 | get:function(){ | ||
266 | return this._dtextRotate; | ||
267 | }, | ||
268 | set:function(value){ | ||
269 | if (this._dtextRotate !== value) { | ||
270 | this._dtextRotate = value; | ||
271 | this.layerData.dtextRotate = value; | ||
272 | } | ||
273 | |||
274 | } | ||
275 | }, | ||
276 | |||
277 | /* isSelected: whether or not the layer is currently selected. */ | 223 | /* isSelected: whether or not the layer is currently selected. */ |
278 | _isSelected:{ | 224 | _isSelected:{ |
279 | value: false, | 225 | value: false |
280 | writable: true, | ||
281 | serializable: true, | ||
282 | enumerable: false | ||
283 | }, | 226 | }, |
284 | 227 | ||
285 | isSelected:{ | 228 | isSelected:{ |
@@ -319,9 +262,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
319 | 262 | ||
320 | 263 | ||
321 | _isAnimated:{ | 264 | _isAnimated:{ |
322 | value: false, | 265 | value: false |
323 | writable: true, | ||
324 | enumerable: false | ||
325 | }, | 266 | }, |
326 | 267 | ||
327 | isAnimated:{ | 268 | isAnimated:{ |
@@ -363,7 +304,6 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
363 | 304 | ||
364 | // Are the various collapsers collapsed or not | 305 | // Are the various collapsers collapsed or not |
365 | _isMainCollapsed : { | 306 | _isMainCollapsed : { |
366 | serializable: true, | ||
367 | value: true | 307 | value: true |
368 | }, | 308 | }, |
369 | isMainCollapsed : { | 309 | isMainCollapsed : { |
@@ -378,23 +318,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
378 | } | 318 | } |
379 | }, | 319 | }, |
380 | 320 | ||
381 | _isTransformCollapsed : { | ||
382 | serializable: true, | ||
383 | value: true | ||
384 | }, | ||
385 | isTransformCollapsed : { | ||
386 | serializable: true, | ||
387 | get: function() { | ||
388 | return this._isTransformCollapsed; | ||
389 | }, | ||
390 | set: function(newVal) { | ||
391 | this._isTransformCollapsed = newVal; | ||
392 | this.layerData.isTransformCollapsed = newVal; | ||
393 | } |