diff options
author | Valerio Virgillito | 2012-06-12 00:13:28 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-12 00:13:28 -0700 |
commit | 5e010900b91d8634ba6caed0c97ccc1ccdec1ff7 (patch) | |
tree | a1a67ad92c09a3a3b85c2285e7b2fa1d7a655f64 /js | |
parent | 844d59d85a1881525c79a1f44a35a9ea59e70e4a (diff) | |
download | ninja-5e010900b91d8634ba6caed0c97ccc1ccdec1ff7.tar.gz |
adding more missing properties to the timeline
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js')
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 38 | ||||
-rw-r--r-- | js/panels/Timeline/Style.reel/Style.js | 30 | ||||
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 4 | ||||
-rw-r--r-- | js/panels/Timeline/Track.reel/Track.js | 5 | ||||
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 10 |
5 files changed, 74 insertions, 13 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 16fb0303..474190b9 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
@@ -15,8 +15,39 @@ 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 | dynamicLayerName: { |
19 | value: true | 19 | value: null, |
20 | serializable: true | ||
21 | }, | ||
22 | |||
23 | dynamicLayerTag: { | ||
24 | value: null, | ||
25 | serializable: true | ||
26 | }, | ||
27 | |||
28 | positionCollapser: { | ||
29 | value: null, | ||
30 | serializable: true | ||
31 | }, | ||
32 | |||
33 | transformCollapser: { | ||
34 | value: null, | ||
35 | serializable: true | ||
36 | }, | ||
37 | |||
38 | styleCollapser: { | ||
39 | value: null, | ||
40 | serializable: true | ||
41 | }, | ||
42 | |||
43 | clickerMain: { | ||
44 | value: null, | ||
45 | serializable: true | ||
46 | }, | ||
47 | |||
48 | myLabel: { | ||
49 | value: null, | ||
50 | serializable: true | ||
20 | }, | 51 | }, |
21 | 52 | ||
22 | /* Begin: Models */ | 53 | /* Begin: Models */ |
@@ -31,7 +62,8 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
31 | }, | 62 | }, |
32 | set: function(newVal) { | 63 | set: function(newVal) { |
33 | this._mainCollapser = newVal; | 64 | this._mainCollapser = newVal; |
34 | } | 65 | }, |
66 | serializable: true | ||
35 | }, | 67 | }, |
36 | 68 | ||
37 | /* Style models: the array of styles, and the repetition that uses them */ | 69 | /* Style models: the array of styles, and the repetition that uses them */ |
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 === */ | 48 | /* === BEGIN: Models === */ |
28 | // isSelected: whether or not the style is selected | 49 | // isSelected: whether or not the style is selected |
29 | _isSelected: { | 50 | _isSelected: { |
@@ -112,7 +133,8 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { | |||
112 | }, | 133 | }, |
113 | set: function(newVal) { | 134 | set: function(newVal) { |
114 | this._myHintable = newVal; | 135 | this._myHintable = newVal; |
115 | } | 136 | }, |
137 | serializable: true | ||
116 | }, | 138 | }, |
117 | _myHintableValue : { | 139 | _myHintableValue : { |
118 | value: null | 140 | value: null |
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 126e6a61..7cfe07a6 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -11,8 +11,8 @@ 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:{ | 14 | tween: { |
15 | value:true | 15 | value: null |
16 | }, | 16 | }, |
17 | 17 | ||
18 | _trackID:{ | 18 | _trackID:{ |
diff --git a/js/panels/Timeline/Track.reel/Track.js b/js/panels/Timeline/Track.reel/Track.js index 8c52199a..2ef760b7 100644 --- a/js/panels/Timeline/Track.reel/Track.js +++ b/js/panels/Timeline/Track.reel/Track.js | |||
@@ -10,8 +10,9 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve | |||
10 | 10 | ||
11 | var Track = exports.Track = Montage.create(Component, { | 11 | var Track = exports.Track = Montage.create(Component, { |
12 | 12 | ||
13 | hasTemplate:{ | 13 | track_lane: { |
14 | value: true | 14 | value: null, |
15 | serializable: true | ||
15 | }, | 16 | }, |
16 | 17 | ||
17 | _trackID:{ | 18 | _trackID:{ |
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index 8b6826ed..dda06028 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js | |||
@@ -9,8 +9,14 @@ var Component = require("montage/ui/component").Component; | |||
9 | 9 | ||
10 | var Tween = exports.Tween = Montage.create(Component, { | 10 | var Tween = exports.Tween = Montage.create(Component, { |
11 | 11 | ||
12 | hasTemplate:{ | 12 | keyframe: { |
13 | value: true | 13 | value: null, |
14 | serializable: true | ||
15 | }, | ||
16 | |||
17 | tweenspan: { | ||
18 | value: null, | ||
19 | serializable: true | ||
14 | }, | 20 | }, |
15 | 21 | ||
16 | _tweenData:{ | 22 | _tweenData:{ |