diff options
author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/panels/Timeline | |
parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r-- | js/panels/Timeline/Collapser.js | 34 | ||||
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 47 | ||||
-rw-r--r-- | js/panels/Timeline/Style.reel/Style.js | 30 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 107 | ||||
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 8 | ||||
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 83 | ||||
-rw-r--r-- | js/panels/Timeline/Track.reel/Track.js | 5 | ||||
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 10 |
8 files changed, 296 insertions, 28 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 16fb0303..a2d6444d 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
@@ -15,8 +15,34 @@ var nj = require("js/lib/NJUtils").NJUtils; | |||
15 | 15 | ||
16 | var Layer = exports.Layer = Montage.create(Component, { | 16 | var Layer = exports.Layer = Montage.create(Component, { |
17 | 17 | ||
18 | hasTemplate:{ | 18 | dynamicLayerTag: { |
19 | value: true | 19 | value: null, |
20 | serializable: true | ||
21 | }, | ||
22 | |||
23 | positionCollapser: { | ||
24 | value: null, | ||
25 | serializable: true | ||
26 | }, | ||
27 | |||
28 | transformCollapser: { | ||
29 | value: null, | ||
30 | serializable: true | ||
31 | }, | ||
32 | |||
33 | styleCollapser: { | ||
34 | value: null, | ||
35 | serializable: true | ||
36 | }, | ||
37 | |||
38 | clickerMain: { | ||
39 | value: null, | ||
40 | serializable: true | ||
41 | }, | ||
42 | |||
43 | myLabel: { | ||
44 | value: null, | ||
45 | serializable: true | ||
20 | }, | 46 | }, |
21 | 47 | ||
22 | /* Begin: Models */ | 48 | /* Begin: Models */ |
@@ -31,7 +57,8 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
31 | }, | 57 | }, |
32 | set: function(newVal) { | 58 | set: function(newVal) { |
33 | this._mainCollapser = newVal; | 59 | this._mainCollapser = newVal; |
34 | } | 60 | }, |
61 | serializable: true | ||
35 | }, | 62 | }, |
36 | 63 | ||
37 | /* Style models: the array of styles, and the repetition that uses them */ | 64 | /* Style models: the array of styles, and the repetition that uses them */ |
@@ -345,6 +372,19 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
345 | _layerEditable : { | 372 | _layerEditable : { |
346 | value: false | 373 | value: false |
347 | }, | 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 | }, | ||
348 | 388 | ||
349 | // Are the various collapsers collapsed or not | 389 | // Are the various collapsers collapsed or not |
350 | _isMainCollapsed : { | 390 | _isMainCollapsed : { |
@@ -429,6 +469,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
429 | }, | 469 | }, |
430 | 470 | ||
431 | layerData:{ | 471 | layerData:{ |
472 | serializable: true, | ||
432 | get:function(){ | 473 | get:function(){ |
433 | return this._layerData; | 474 | return this._layerData; |
434 | }, | 475 | }, |
diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js index c39f3a56..eed58a65 100644 --- a/js/panels/Timeline/Style.reel/Style.js +++ b/js/panels/Timeline/Style.reel/Style.js | |||
@@ -20,10 +20,31 @@ var Component = require("montage/ui/component").Component; | |||
20 | 20 | ||
21 | var LayerStyle = exports.LayerStyle = Montage.create(Component, { | 21 | var LayerStyle = exports.LayerStyle = Montage.create(Component, { |
22 | 22 | ||
23 | hasTemplate:{ | 23 | styleContainer: { |
24 | value: true | 24 | value: null, |
25 | serializable: true | ||
25 | }, | 26 | }, |
26 | 27 | ||
28 | styleHintable: { | ||
29 | value: null, | ||
30 | serializable: true | ||
31 | }, | ||
32 | |||
33 | styleProperty: { | ||
34 | value: null, | ||
35 | serializable: true | ||
36 | }, | ||
37 | |||
38 | valueEditorHottext: { | ||
39 | value: null, | ||
40 | serializable: true | ||
41 | }, | ||
42 | |||
43 | dtextProperty: { | ||
44 | value: null, | ||
45 | serializable: true | ||
46 | }, | ||
47 | |||
27 | /* === BEGIN: Models === */ |