aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js202
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js.orig561
-rw-r--r--js/panels/Timeline/Span.reel/Span.js46
-rw-r--r--js/panels/Timeline/Style.reel/Style.js7
-rw-r--r--js/panels/Timeline/Track.reel/Track.html63
-rw-r--r--js/panels/Timeline/Track.reel/Track.js187
-rw-r--r--js/panels/Timeline/Track.reel/css/Track.css32
-rw-r--r--js/panels/Timeline/Track.reel/images/gridline.jpgbin724 -> 0 bytes
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html30
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js21
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css11
11 files changed, 682 insertions, 478 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index c4571e9d..de2e5bb5 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -9,26 +9,14 @@ var Component = require("montage/ui/component").Component;
9 9
10var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { 10var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
11 11
12 /* ===- Begin Models ==== */
13 hasTemplate:{ 12 hasTemplate:{
14 value: true 13 value: true
15 }, 14 },
16 15
17 trackEditorProperty:{
18 value:""
19 },
20
21 animatedElement:{
22 value:null
23 },
24
25 isSubproperty:{
26 value:true
27 },
28
29 _propTweenRepetition:{ 16 _propTweenRepetition:{
30 value:null 17 value:null
31 }, 18 },
19
32 propTweenRepetition:{ 20 propTweenRepetition:{
33 get:function () { 21 get:function () {
34 return this._propTweenRepetition; 22 return this._propTweenRepetition;
@@ -41,6 +29,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
41 _propTweens:{ 29 _propTweens:{
42 value:[] 30 value:[]
43 }, 31 },
32
44 propTweens:{ 33 propTweens:{
45 serializable:true, 34 serializable:true,
46 get:function () { 35 get:function () {
@@ -54,6 +43,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
54 _propTrackData:{ 43 _propTrackData:{
55 value:false 44 value:false
56 }, 45 },
46
57 propTrackData:{ 47 propTrackData:{
58 serializable:true, 48 serializable:true,
59 get:function () { 49 get:function () {
@@ -66,30 +56,10 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
66 } 56 }
67 } 57 }
68 }, 58 },
69
70 nextKeyframe:{
71 value:1
72 },
73
74 ninjaStylesContoller:{
75 value:null
76 },
77
78 animationName:{
79 value:null
80 },
81
82 currentKeyframeRule:{
83 value:null
84 },
85
86 trackDuration:{
87 value:0
88 },
89
90 _trackID:{ 59 _trackID:{
91 value:null 60 value:null
92 }, 61 },
62
93 trackID:{ 63 trackID:{
94 serializable:true, 64 serializable:true,
95 get:function () { 65 get:function () {
@@ -105,6 +75,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
105 _trackType:{ 75 _trackType:{
106 value:null 76 value:null
107 }, 77 },
78
108 trackType:{ 79 trackType:{
109 serializable:true, 80 serializable:true,
110 get:function () { 81 get:function () {
@@ -120,6 +91,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
120 _styleIndex:{ 91 _styleIndex:{
121 value:null 92 value:null
122 }, 93 },
94
123 styleIndex:{ 95 styleIndex:{
124 serializable:true, 96 serializable:true,
125 get:function () { 97 get:function () {
@@ -132,6 +104,42 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
132 } 104 }
133 }, 105 },
134 106
107 trackEditorProperty:{
108 value:""
109 },
110
111 animatedElement:{
112 value:null
113 },
114
115 isSubproperty:{
116 value:true
117 },
118
119 nextKeyframe:{
120 value:1
121 },
122
123 ninjaStylesContoller:{
124 value:null
125 },
126
127 animationName:{
128 value:null
129 },
130
131 currentKeyframeRule:{
132 value:null
133 },
134
135 trackDuration:{
136 value:0
137 },
138
139 timelineTrack:{
140 value:null
141 },
142
135 setData:{ 143 setData:{
136 value:function () { 144 value:function () {
137 if (typeof(this.propTrackData) === "undefined") { 145 if (typeof(this.propTrackData) === "undefined") {
@@ -146,40 +154,42 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
146 this.needsDraw = true; 154 this.needsDraw = true;
147 } 155 }
148 }, 156 },
149 /* ===- End Models ==== */
150 157
151 /* ===- Begin Draw Cycle ==== */
152 prepareForDraw:{ 158 prepareForDraw:{
153 value:function () { 159 value:function(){
154 this.element.addEventListener("click", this, false); 160 this.element.addEventListener("click", this, false);
155 this.trackID = this.parentComponent.parentComponent.parentComponent.parentComponent.trackID; 161 this.timelineTrack = this.parentComponent.parentComponent.parentComponent.parentComponent;
156 this.animatedElement = this.parentComponent.parentComponent.parentComponent.parentComponent.animatedElement; 162 this.trackID = this.timelineTrack.trackID;
163 this.animatedElement = this.timelineTrack.animatedElement;
157 this.ninjaStylesContoller = this.application.ninja.stylesController; 164 this.ninjaStylesContoller = this.application.ninja.stylesController;
158 } 165 }
159 }, 166 },
160 167
161 didDraw:{ 168 didDraw:{
162 value:function () { 169 value:function () {
163 if (this.currentKeyframeRule) { 170 if(this.currentKeyframeRule){
164 this.retrieveStoredStyleTweens(); 171 this.retrieveStoredStyleTweens();
165 } 172 }
166 } 173 }
167 }, 174 },
168 /* ===- End Draw Cycle ==== */
169 175
170 /* ===- Begin Event Handlers ==== */
171 handleClick:{ 176 handleClick:{
172 value:function (ev) { 177 value:function (ev) {
178
179 var selectIndex , currentSelectedStyleIndex;
173 if (ev.shiftKey) { 180 if (ev.shiftKey) {
181
174 if (this.trackType == "position") { 182 if (this.trackType == "position") {
175 this.parentComponent.parentComponent.parentComponent.parentComponent.handleNewTween(ev); 183 this.timelineTrack.handleNewTween(ev);
176 }