diff options
author | Armen Kesablyan | 2012-06-21 14:33:01 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-21 14:33:01 -0700 |
commit | 9fe9bc495af74d963fa7061d4d1a479720133a56 (patch) | |
tree | eca4b0d785ad28483904682b7fdfdb9686fc3d1a /js/panels/Timeline/PropertyTrack.reel | |
parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
parent | c411f76d89c543837548085ff468fee0fb4f2ff9 (diff) | |
download | ninja-9fe9bc495af74d963fa7061d4d1a479720133a56.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel')
4 files changed, 527 insertions, 6 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html index a4b598c5..9c4160c8 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html | |||
@@ -13,16 +13,50 @@ | |||
13 | "owner": { | 13 | "owner": { |
14 | "prototype": "js/panels/Timeline/PropertyTrack.reel", | 14 | "prototype": "js/panels/Timeline/PropertyTrack.reel", |
15 | "properties": { | 15 | "properties": { |
16 | "element": {"#": "property-track"} | 16 | "element": {"#": "property-track"}, |
17 | "propTweenRepetition" : {"@" : "propTweenRepetition"}, | ||
18 | "propTween": {"@" : "propTween"} | ||
17 | } | 19 | } |
18 | } | 20 | }, |
21 | |||
22 | "propTween" : { | ||
23 | "prototype" : "js/panels/timeline/Tween.reel", | ||
24 | "properties" : { | ||
25 | "element":{"#": "prop_track_lane"} | ||
26 | }, | ||
27 | "bindings" : { | ||
28 | "tweenData" : { | ||
29 | "boundObject" : {"@": "propTweenRepetition"}, | ||
30 | "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenData", | ||
31 | "oneway" : false | ||
32 | } | ||
33 | } | ||
34 | }, | ||
19 | 35 | ||
36 | "propTweenRepetition": { | ||
37 | "prototype": "montage/ui/repetition.reel", | ||
38 | "properties": { | ||
39 | "element": {"#": "prop_track_lanes"}, | ||
40 | "isSelectionEnabled" : false | ||
41 | }, | ||
42 | "bindings": { | ||
43 | "objects": { | ||
44 | "boundObject": {"@": "owner"}, | ||
45 | "boundObjectPropertyPath": "propTweens", | ||
46 | "oneway": false | ||
47 | } | ||
48 | } | ||
49 | } | ||
20 | } | 50 | } |
21 | </script> | 51 | </script> |
22 | </head> | 52 | </head> |
23 | <body> | 53 | <body> |
24 | 54 | ||
25 | <div data-montage-id="property-track" class="timeline-track"></div> | 55 | <div data-montage-id="property-track" class="timeline-track"> |
56 | <div data-montage-id="prop_track_lanes" class="prop-track"> | ||
57 | <div data-montage-id="prop_track_lane"></div> | ||
58 | </div> | ||
59 | </div> | ||
26 | 60 | ||
27 | </body> | 61 | </body> |
28 | </html> \ No newline at end of file | 62 | </html> \ No newline at end of file |
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js index 175b77f9..66f39b5a 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | |||
@@ -15,7 +15,481 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
15 | 15 | ||
16 | prepareForDraw:{ | 16 | prepareForDraw:{ |
17 | value:function(){ | 17 | value:function(){ |
18 | this.element.addEventListener("click", this, false); | ||
19 | this.trackID = this.parentComponent.parentComponent.parentComponent.trackID; | ||
20 | this.animatedElement = this.parentComponent.parentComponent.parentComponent.animatedElement; | ||
21 | this.ninjaStylesContoller = this.application.ninja.stylesController; | ||
22 | } | ||
23 | }, | ||
24 | |||
25 | draw:{ | ||
26 | value:function(){ | ||
27 | |||
28 | } | ||
29 | }, | ||
30 | |||
31 | didDraw:{ | ||
32 | value:function () { | ||
33 | if(this.currentKeyframeRule){ | ||
34 | this.retrieveStoredStyleTweens(); | ||
35 | } | ||
36 | } | ||
37 | }, | ||
38 | |||
39 | trackEditorProperty:{ | ||
40 | value:"" | ||
41 | }, | ||
42 | |||
43 | animatedElement:{ | ||
44 | value:null | ||
45 | }, | ||
46 | |||
47 | isSubproperty:{ | ||
48 | value:true | ||
49 | }, | ||
50 | |||
51 | _propTweenRepetition:{ | ||
52 | value:null | ||
53 | }, | ||
54 | |||
55 | propTweenRepetition:{ | ||
56 | get:function () { | ||
57 | return this._propTweenRepetition; | ||
58 | }, | ||
59 | set:function (newVal) { | ||
60 | this._propTweenRepetition = newVal; | ||
61 | } | ||
62 | }, | ||
63 | |||
64 | _propTweens:{ | ||
65 | value:[] | ||
66 | }, | ||
67 | |||
68 | propTweens:{ | ||
69 | serializable:true, | ||
70 | get:function () { | ||
71 | return this._propTweens; | ||
72 | }, | ||
73 | set:function (newVal) { | ||
74 | this._propTweens = newVal; | ||
75 | } | ||
76 | }, | ||
77 | |||
78 | _propTrackData:{ | ||
79 | value:false | ||
80 | }, | ||
81 | |||
82 | propTrackData:{ | ||
83 | serializable:true, | ||
84 | get:function () { | ||
85 | return this._propTrackData; | ||
86 | }, | ||
87 | set:function (val) { | ||
88 | this._propTrackData = val; | ||
89 | if (this._propTrackData) { | ||
90 | this.setData(); | ||
91 | } | ||
92 | } | ||
93 | }, | ||
94 | |||
95 | nextKeyframe:{ | ||
96 | value:1 | ||
97 | }, | ||
98 | |||
99 | ninjaStylesContoller:{ | ||
100 | value:null | ||
101 | }, | ||
102 | |||
103 | animationName:{ | ||
104 | value:null | ||
105 | }, | ||
106 | |||
107 | currentKeyframeRule:{ | ||
108 | value:null | ||
109 | }, | ||
110 | |||
111 | trackDuration:{ | ||
112 | value:0 | ||
113 | }, | ||
114 | |||
115 | _trackID:{ | ||
116 | value:null | ||
117 | }, | ||
118 | |||
119 | trackID:{ | ||
120 | serializable:true, | ||
121 | get:function () { | ||
122 | return this._trackID; | ||
123 | }, | ||
124 | set:function (value) { | ||
125 | if (value !== this._trackID) { | ||
126 | this._trackID = value; | ||
127 | } | ||
128 | } | ||
129 | }, | ||
130 | |||
131 | _trackType:{ | ||
132 | value:null | ||
133 | }, | ||
134 | |||
135 | trackType:{ | ||
136 | serializable:true, | ||
137 | get:function () { | ||
138 | return this._trackType; | ||
139 | }, | ||
140 | set:function (value) { | ||
141 | if (value !== this._trackType) { | ||
142 | this._trackType = value; | ||
143 | } | ||
144 | } | ||
145 | }, | ||
146 | |||
147 | _styleIndex:{ | ||
148 | value:null | ||
149 | }, | ||
150 | |||
151 | styleIndex:{ | ||
152 | serializable:true, | ||
153 | get:function () { | ||
154 | return this._styleIndex; | ||
155 | }, | ||
156 | set:function (value) { | ||
157 | if (value !== this._styleIndex) { | ||
158 | this._styleIndex = value; | ||
159 | } | ||
160 | } | ||