diff options
-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 | 9 | ||||
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 58 |
4 files changed, 101 insertions, 13 deletions
diff --git a/js/panels/Timeline/Collapser.js b/js/panels/Timeline/Collapser.js index 9c8d4434..42bbbb86 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 | value: true | 186 | value: true |
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index acc0567c..f81d8b09 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
@@ -348,6 +348,19 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
348 | _layerEditable : { | 348 | _layerEditable : { |
349 | value: false | 349 | value: false |
350 | }, | 350 | }, |
351 | |||
352 | _dynamicLayerName:{ | ||
353 | value:true | ||
354 | }, | ||
355 | dynamicLayerName:{ | ||
356 | serializable:true, | ||
357 | get:function () { | ||
358 | return this._dynamicLayerName; | ||
359 | }, | ||
360 | set:function (newVal) { | ||
361 | this._dynamicLayerName = newVal; | ||
362 | } | ||
363 | }, | ||
351 | 364 | ||
352 | // Are the various collapsers collapsed or not | 365 | // Are the various collapsers collapsed or not |
353 | _isMainCollapsed : { | 366 | _isMainCollapsed : { |
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index 0d7f517f..8c550f00 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -17,9 +17,10 @@ | |||
17 | "tweenRepetition" : {"@" : "tweenRepetition"}, | 17 | "tweenRepetition" : {"@" : "tweenRepetition"}, |
18 | "track_lanes" : {"#" : "track_lanes"}, | 18 | "track_lanes" : {"#" : "track_lanes"}, |
19 | "tween": {"@" : "tween"}, | 19 | "tween": {"@" : "tween"}, |
20 | "_mainCollapser" : {"@" : "mainCollapser"}, | 20 | "mainCollapser" : {"@" : "mainCollapser"}, |
21 | "_positionCollapser" : {"@" : "positionCollapser"}, | 21 | "positionCollapser" : {"@" : "positionCollapser"}, |
22 | "_styleCollapser" : {"@" : "styleCollapser"} | 22 | "transformCollapser" : {"@" : "transformCollapser"}, |
23 | "styleCollapser" : {"@" : "styleCollapser"} | ||
23 | } | 24 | } |
24 | }, | 25 | }, |
25 | 26 | ||
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 3b2b3fff..adad6ff3 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 | hasTemplate:{ | ||
15 | value:true | ||
16 | }, | ||
17 | |||
18 | _trackID:{ | 14 | _trackID:{ |
19 | value:null | 15 | value:null |
20 | }, | 16 | }, |
@@ -31,11 +27,21 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
31 | } | 27 | } |
32 | } | 28 | } |
33 | }, | 29 | }, |
34 | 30 | ||
35 | _isFirstDraw: { | 31 | _tween:{ |
36 | value: true | 32 | value:[] |
37 | }, | 33 | }, |
38 | 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 | |||
39 | _isVisible:{ | 45 | _isVisible:{ |
40 | value: true | 46 | value: true |
41 | }, | 47 | }, |
@@ -345,15 +351,51 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
345 | _positionCollapser:{ | 351 | _positionCollapser:{ |
346 | value:null | 352 | value:null |
347 | }, | 353 | }, |
354 | positionCollapser:{ | ||
355 | serializable:true, | ||
356 | get:function(){ | ||
357 | return this._positionCollapser; | ||
358 | }, | ||
359 | set:function(val){ | ||
360 | this._positionCollapser = val; | ||
361 | } | ||
362 | }, | ||
348 | _mainCollapser:{ | 363 | _mainCollapser:{ |
349 | value:null | 364 | value:null |
350 | }, | 365 | }, |
366 | mainCollapser:{ | ||
367 | serializable:true, | ||
368 | get:function () { | ||
369 | return this._mainCollapser; | ||
370 | }, | ||
371 | set:function (val) { | ||
372 | this._mainCollapser = val; | ||
373 | } | ||
374 | }, | ||
351 | _transformCollapser:{ | 375 | _transformCollapser:{ |
352 | value:null | 376 | value:null |
353 | }, | 377 | }, |
378 | transformCollapser:{ | ||