aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Reid2012-07-09 14:53:00 -0700
committerJon Reid2012-07-09 14:53:00 -0700
commit65a9d88691a9f10130ebd853492dab0d59f4aa53 (patch)
tree0bbb855eadc71c09a1118a22f275f01b735f2ac5
parentd2ae0619d673e66d59d7a0584fc14d420511dcdf (diff)
parentd874dda445a3baa2dd24b9554b6fc7f620dd5e89 (diff)
downloadninja-65a9d88691a9f10130ebd853492dab0d59f4aa53.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js292
-rw-r--r--js/panels/Timeline/Span.reel/Span.js88
-rw-r--r--js/panels/Timeline/Style.reel/Style.js7
-rw-r--r--js/panels/Timeline/Track.reel/Track.html87
-rw-r--r--js/panels/Timeline/Track.reel/Track.js211
-rw-r--r--js/panels/Timeline/Track.reel/css/Track.css56
-rw-r--r--js/panels/Timeline/Track.reel/images/gridline.jpgbin724 -> 0 bytes
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html54
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js45
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css35
10 files changed, 230 insertions, 645 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 33029e9e..b2683d30 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -33,26 +33,17 @@ var Component = require("montage/ui/component").Component;
33 33
34var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { 34var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
35 35
36 /* ===- Begin Models ==== */ 36
37 hasTemplate:{ 37 hasTemplate:{
38 value: true 38 value: true
39 }, 39 },
40 40
41 trackEditorProperty:{ 41 /* Begin: Models */
42 value:""
43 },
44
45 animatedElement:{
46 value:null
47 },
48
49 isSubproperty:{
50 value:true
51 },
52 42
53 _propTweenRepetition:{ 43 _propTweenRepetition:{
54 value:null 44 value:null
55 }, 45 },
46
56 propTweenRepetition:{ 47 propTweenRepetition:{
57 get:function () { 48 get:function () {
58 return this._propTweenRepetition; 49 return this._propTweenRepetition;
@@ -65,6 +56,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
65 _propTweens:{ 56 _propTweens:{
66 value:[] 57 value:[]
67 }, 58 },
59
68 propTweens:{ 60 propTweens:{
69 serializable:true, 61 serializable:true,
70 get:function () { 62 get:function () {
@@ -78,6 +70,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
78 _propTrackData:{ 70 _propTrackData:{
79 value:false 71 value:false
80 }, 72 },
73
81 propTrackData:{ 74 propTrackData:{
82 serializable:true, 75 serializable:true,
83 get:function () { 76 get:function () {
@@ -90,30 +83,10 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
90 } 83 }
91 } 84 }
92 }, 85 },
93
94 nextKeyframe:{
95 value:1
96 },
97
98 ninjaStylesContoller:{
99 value:null
100 },
101
102 animationName:{
103 value:null
104 },
105
106 currentKeyframeRule:{
107 value:null
108 },
109
110 trackDuration:{
111 value:0
112 },
113
114 _trackID:{ 86 _trackID:{
115 value:null 87 value:null
116 }, 88 },
89
117 trackID:{ 90 trackID:{
118 serializable:true, 91 serializable:true,
119 get:function () { 92 get:function () {
@@ -129,6 +102,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
129 _trackType:{ 102 _trackType:{
130 value:null 103 value:null
131 }, 104 },
105
132 trackType:{ 106 trackType:{
133 serializable:true, 107 serializable:true,
134 get:function () { 108 get:function () {
@@ -144,6 +118,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
144 _styleIndex:{ 118 _styleIndex:{
145 value:null 119 value:null
146 }, 120 },
121
147 styleIndex:{ 122 styleIndex:{
148 serializable:true, 123 serializable:true,
149 get:function () { 124 get:function () {
@@ -156,6 +131,42 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
156 } 131 }
157 }, 132 },
158 133
134 trackEditorProperty:{
135 value:""
136 },
137
138 animatedElement:{
139 value:null
140 },
141
142 isSubproperty:{
143 value:true
144 },
145
146 nextKeyframe:{
147 value:1
148 },
149
150 ninjaStylesContoller:{
151 value:null
152 },
153
154 animationName:{
155 value:null
156 },
157
158 currentKeyframeRule:{
159 value:null
160 },
161
162 trackDuration:{
163 value:0
164 },
165
166 timelineTrack:{
167 value:null
168 },
169
159 setData:{ 170 setData:{
160 value:function () { 171 value:function () {
161 if (typeof(this.propTrackData) === "undefined") { 172 if (typeof(this.propTrackData) === "undefined") {
@@ -170,40 +181,51 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
170 this.needsDraw = true; 181 this.needsDraw = true;
171 } 182 }
172 }, 183 },
173 /* ===- End Models ==== */
174 184
175 /* ===- Begin Draw Cycle ==== */ 185 /* End: Models */
186
187 /* Begin: Draw Cycle */
176 prepareForDraw:{ 188 prepareForDraw:{
177 value:function () { 189 value:function(){
178 this.element.addEventListener("click", this, false); 190 this.element.addEventListener("click", this, false);
179 this.trackID = this.parentComponent.parentComponent.parentComponent.parentComponent.trackID; 191 this.timelineTrack = this.parentComponent.parentComponent.parentComponent.parentComponent;
180 this.animatedElement = this.parentComponent.parentComponent.parentComponent.parentComponent.animatedElement; 192 this.trackID = this.timelineTrack.trackID;
193 this.animatedElement = this.timelineTrack.animatedElement;
181 this.ninjaStylesContoller = this.application.ninja.stylesController; 194 this.ninjaStylesContoller = this.application.ninja.stylesController;
182 } 195 }
183 }, 196 },
184 197
185 didDraw:{ 198 didDraw:{
186 value:function () { 199 value:function () {
187 if (this.currentKeyframeRule) { 200 if(this.currentKeyframeRule){
188 this.retrieveStoredStyleTweens(); 201 this.retrieveStoredStyleTweens();
189 } 202 }
190 } 203 }
191 }, 204 },
192 /* ===- End Draw Cycle ==== */
193 205
194 /* ===- Begin Event Handlers ==== */ 206 /* End: Draw Cycle */
207
208 /* Begin: Event Handlers */
209
195 handleClick:{ 210 handleClick:{
196 value:function (ev) { 211 value:function (ev) {
212