diff options
Diffstat (limited to 'js/panels')
-rw-r--r-- | js/panels/Timeline/Collapser.js | 34 | ||||
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 13 | ||||
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 8 | ||||
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 55 |
4 files changed, 101 insertions, 9 deletions
diff --git a/js/panels/Timeline/Collapser.js b/js/panels/Timeline/Collapser.js index 88314c8b..e5c04279 100644 --- a/js/panels/Timeline/Collapser.js +++ b/js/panels/Timeline/Collapser.js | |||
@@ -41,6 +41,7 @@ var Montage = require("montage/core/core").Montage, | |||
41 | value: 0 | 41 | value: 0 |
42 | }, | 42 | }, |
43 | contentHeight: { | 43 | contentHeight: { |
44 | serializable: true, | ||
44 | get: function() { | 45 | get: function() { |
45 | return this._contentHeight; | 46 | return this._contentHeight; |
46 | }, | 47 | }, |
@@ -59,6 +60,7 @@ var Montage = require("montage/core/core").Montage, | |||
59 | value: false | 60 | value: false |
60 | }, | 61 | }, |
61 | isAnimated: { | 62 | isAnimated: { |
63 | serializable: true, | ||
62 | get: function() { | 64 | get: function() { |
63 | return this._isAnimated; | 65 | return this._isAnimated; |
64 | }, | 66 | }, |
@@ -71,6 +73,7 @@ var Montage = require("montage/core/core").Montage, | |||
71 | value: true | 73 | value: true |
72 | }, | 74 | }, |
73 | bypassAnimation: { | 75 | bypassAnimation: { |
76 | serializable: true, | ||
74 | get: function() { | 77 | get: function() { |
75 | return this._bypassAnimation; | 78 | return this._bypassAnimation; |
76 | }, | 79 | }, |
@@ -102,6 +105,7 @@ var Montage = require("montage/core/core").Montage, | |||
102 | value: "" | 105 | value: "" |
103 | }, | 106 | }, |
104 | isCollapsed : { | 107 | isCollapsed : { |
108 | serializable: true, | ||
105 | get: function() { | 109 | get: function() { |
106 | return this._isCollapsed; | 110 | return this._isCollapsed; |
107 | }, | 111 | }, |
@@ -110,7 +114,6 @@ var Montage = require("montage/core/core").Montage, | |||
110 | this._isCollapsed = newVal; | 114 | this._isCollapsed = newVal; |
111 | //this.needsDraw = true; | 115 | //this.needsDraw = true; |
112 | } | 116 | } |
113 | |||
114 | } | 117 | } |
115 | }, | 118 | }, |
116 | 119 | ||
@@ -141,6 +144,7 @@ var Montage = require("montage/core/core").Montage, | |||
141 | value: true | 144 | value: true |
142 | }, | 145 | }, |
143 | isLabelClickable : { | 146 | isLabelClickable : { |
147 | serializable: true, | ||
144 | get: function() { | 148 | get: function() { |
145 | return this._isLabelClickable; | 149 | return this._isLabelClickable; |
146 | }, | 150 | }, |
@@ -149,6 +153,34 @@ var Montage = require("montage/core/core").Montage, | |||
149 | } | 153 | } |
150 | }, | 154 | }, |
151 | 155 | ||
156 | _myContent:{ | ||
157 | value:null | ||
158 | }, | ||
159 | |||
160 | myContent:{ | ||
161 | serializable:true, | ||
162 | get:function () { | ||
163 | return this._myContent; | ||
164 | }, | ||
165 | set:function (newVal) { | ||
166 | this._myContent = newVal; | ||
167 | } | ||
168 | }, | ||
169 | |||
170 | _clicker:{ | ||
171 | value:null | ||
172 | }, | ||
173 | |||
174 | clicker:{ | ||
175 | serializable:true, | ||
176 | get:function () { | ||
177 | return this._clicker; | ||
178 | }, | ||
179 | set:function (newVal) { | ||
180 | this._clicker = newVal; | ||
181 | } | ||
182 | }, | ||
183 | |||
152 | // isToggling: Bindable property. Set this (to anything) to trigger a toggle. | 184 | // isToggling: Bindable property. Set this (to anything) to trigger a toggle. |
153 | _isToggling: { | 185 | _isToggling: { |
154 | serializable: true, | 186 | serializable: true, |
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 6b64261e..a2d6444d 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
@@ -372,6 +372,19 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
372 | _layerEditable : { | 372 | _layerEditable : { |
373 | value: false | 373 | value: false |
374 | }, | 374 | }, |
375 | |||
376 | _dynamicLayerName:{ | ||
377 | value:true | ||
378 | }, | ||
379 | dynamicLayerName:{ | ||
380 | serializable:true, | ||
381 | get:function () { | ||
382 | return this._dynamicLayerName; | ||
383 | }, | ||
384 | set:function (newVal) { | ||
385 | this._dynamicLayerName = newVal; | ||
386 | } | ||
387 | }, | ||
375 | 388 | ||
376 | // Are the various collapsers collapsed or not | 389 | // Are the various collapsers collapsed or not |
377 | _isMainCollapsed : { | 390 | _isMainCollapsed : { |
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index 5c5a8b76..091470f3 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |||
@@ -16,10 +16,10 @@ | |||
16 | "element": {"#": "track"}, | 16 | "element": {"#": "track"}, |
17 | "tweenRepetition" : {"@" : "tweenRepetition"}, | 17 | "tweenRepetition" : {"@" : "tweenRepetition"}, |
18 | "tween": {"@" : "tween"}, | 18 | "tween": {"@" : "tween"}, |
19 | "_mainCollapser" : {"@" : "mainCollapser"}, | 19 | "mainCollapser" : {"@" : "mainCollapser"}, |
20 | "_positionCollapser" : {"@" : "positionCollapser"}, | 20 | "positionCollapser" : {"@" : "positionCollapser"}, |
21 | "_transformCollapser" : {"@" : "transformCollapser"}, | 21 | "transformCollapser" : {"@" : "transformCollapser"}, |
22 | "_styleCollapser" : {"@" : "styleCollapser"} | 22 | "styleCollapser" : {"@" : "styleCollapser"} |
23 | } | 23 | } |
24 | }, | 24 | }, |
25 | 25 | ||
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 75997466..87a5e156 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -11,10 +11,6 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve | |||
11 | 11 | ||
12 | var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | 12 | var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { |
13 | 13 | ||
14 | tween: { | ||
15 | value: null | ||
16 | }, | ||
17 | |||
18 | _trackID:{ | 14 | _trackID:{ |
19 | value:null | 15 | value:null |
20 | }, | 16 | }, |
@@ -31,6 +27,21 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
31 | } | 27 | } |
32 | } | 28 | } |
33 | }, | 29 | }, |
30 | |||
31 | _tween:{ | ||
32 | value:[] | ||
33 | }, | ||
34 | |||
35 | tween:{ | ||
36 | serializable:true, | ||
37 | get:function () { | ||
38 | return this._tween; | ||
39 | }, | ||
40 | set:function (newVal) { | ||
41 | this._tween = newVal; | ||
42 | } | ||
43 | }, | ||
44 | |||
34 | _isVisible:{ | 45 | _isVisible:{ |
35 | value: true | 46 | value: true |
36 | }, | 47 | }, |
@@ -337,15 +348,51 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
337 | _positionCollapser:{ | 348 | _positionCollapser:{ |
338 | value:null | 349 | value:null |
339 | }, | 350 | }, |
351 | positionCollapser:{ | ||
352 | serializable:true, | ||
353 | get:function(){ | ||
354 | return this._positionCollapser; | ||
355 | }, | ||
356 | set:function(val){ | ||
357 | this._positionCollapser = val; | ||
358 | } | ||
359 | }, | ||
340 | _mainCollapser:{ | 360 | _mainCollapser:{ |
341 | value:null | 361 | value:null |
342 | }, | 362 | }, |
363 | mainCollapser:{ | ||
364 | serializable:true, | ||
365 | get:function () { | ||
366 | return this._mainCollapser; | ||
367 | }, | ||
368 | set:function (val) { | ||
369 | this._mainCollapser = val; | ||
370 | } | ||
371 | }, | ||
343 | _transformCollapser:{ | 372 | _transformCollapser:{ |
344 | value:null | 373 | value:null |
345 | }, | 374 | }, |
375 | transformCollapser:{ | ||
376 | serializable:true, | ||
377 | get:function () { | ||
378 | return this._transformCollapser; | ||
379 | }, | ||
380 | set:function (val) { | ||
381 | this._transformCollapser = val; | ||
382 | } | ||
383 | }, | ||
346 | _styleCollapser:{ | 384 | _styleCollapser:{ |
347 | value:null | 385 | value:null |