aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJonathan Duran2012-05-16 08:58:03 -0700
committerJonathan Duran2012-05-16 08:58:03 -0700
commite5830f3424c7db84f0e76b237616cbf59fe9ed1c (patch)
tree0c9e24997839bccae78fc34b3d4303b138b46850 /js
parent9bc43e9f815dc8c2eda3a3d3413f950481c5f86d (diff)
downloadninja-e5830f3424c7db84f0e76b237616cbf59fe9ed1c.tar.gz
Remove span highlighting and start syncing pos tracks and main track keyframes
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js')
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js12
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js3
2 files changed, 8 insertions, 7 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 8fe87500..a8adbf04 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -183,16 +183,20 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
183 }, 183 },
184 184
185 handleClick:{ 185 handleClick:{
186 value:function(ev){ 186 value:function (ev) {
187 if (ev.shiftKey) { 187 if (ev.shiftKey) {
188 188
189 if (this.trackType == "position") {
190 this.parentComponent.parentComponent.parentComponent.handleNewTween(ev);
191 }
192
189 if (this.propTweens.length < 1) { 193 if (this.propTweens.length < 1) {
190 194
191 // check if there is an editor property assigned yet 195 // check if there is an editor property assigned yet
192 // get this property track's editor prop name from layer data arrays 196 // get this property track's editor prop name from layer data arrays
193 var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); 197 var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
194 198
195 if (this.trackType === "style") { 199 if (this.trackType == "style") {
196 if (this.application.ninja.timeline.arrLayers[selectIndex].layerData.arrLayerStyles[this.styleIndex].editorProperty == null) { 200 if (this.application.ninja.timeline.arrLayers[selectIndex].layerData.arrLayerStyles[this.styleIndex].editorProperty == null) {
197 console.log("Please enter a style property for this track before adding keyframes."); 201 console.log("Please enter a style property for this track before adding keyframes.");
198 return; 202 return;
@@ -200,7 +204,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
200 this.trackEditorProperty = this.application.ninja.timeline.arrLayers[selectIndex].layerData.arrLayerStyles[this.styleIndex].editorProperty; 204 this.trackEditorProperty = this.application.ninja.timeline.arrLayers[selectIndex].layerData.arrLayerStyles[this.styleIndex].editorProperty;
201 //console.log("Property track editorProperty set to: " + this.trackEditorProperty); 205 //console.log("Property track editorProperty set to: " + this.trackEditorProperty);
202 } 206 }
203 } else if (this.trackType === "position") { 207 } else if (this.trackType == "position") {
204 //console.log("Property track editorProperty set to: " + this.trackEditorProperty); 208 //console.log("Property track editorProperty set to: " + this.trackEditorProperty);
205 } 209 }
206 210
@@ -220,7 +224,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
220 if (ev.offsetX > this.propTweens[this.propTweens.length - 1].tweenData.keyFramePosition) { 224 if (ev.offsetX > this.propTweens[this.propTweens.length - 1].tweenData.keyFramePosition) {
221 this.insertPropTween(ev.offsetX); 225 this.insertPropTween(ev.offsetX);
222 } else { 226 } else {
223 console.log("spitting sub keyframes not yet supported"); 227 console.log("Splitting style tweens not yet supported.");
224 } 228 }
225 } 229 }
226 }, 230 },
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index bb7ce735..f857ebd4 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -208,9 +208,6 @@ var Tween = exports.Tween = Montage.create(Component, {
208 } 208 }
209 // tell track to update css rule 209 // tell track to update css rule
210 this.parentComponent.parentComponent.updateKeyframeRule(); 210 this.parentComponent.parentComponent.updateKeyframeRule();
211
212 // highlight the tween's span
213 this.tweenspan.highlightSpan();
214 this.isTweenAnimated = true; 211 this.isTweenAnimated = true;
215 } 212 }
216 }, 213 },