diff options
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js')
-rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js index 752340bb..de2e5bb5 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | |||
@@ -311,7 +311,6 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
311 | 311 | ||
312 | splitTweenIndex = i + 1; | 312 | splitTweenIndex = i + 1; |
313 | 313 | ||
314 | // Update the next tween to have new span position and width. | ||
315 | this.propTweens[i + 1].tweenData.spanPosition = position; | 314 | this.propTweens[i + 1].tweenData.spanPosition = position; |
316 | this.propTweens[i + 1].spanPosition = position; | 315 | this.propTweens[i + 1].spanPosition = position; |
317 | this.propTweens[i + 1].tweenData.spanWidth = this.propTweens[i + 1].tweenData.keyFramePosition - position; | 316 | this.propTweens[i + 1].tweenData.spanWidth = this.propTweens[i + 1].tweenData.keyFramePosition - position; |
@@ -324,7 +323,6 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
324 | } | 323 | } |
325 | this.propTweenRepetition.childComponents[nextComponentIndex].setData(); | 324 | this.propTweenRepetition.childComponents[nextComponentIndex].setData(); |
326 | 325 | ||
327 | // Create the new tween and splice it into the model | ||
328 | var newTweenToInsert = {}; | 326 | var newTweenToInsert = {}; |
329 | newTweenToInsert.tweenData = {}; | 327 | newTweenToInsert.tweenData = {}; |
330 | newTweenToInsert.tweenData.spanWidth = position - prevTween; | 328 | newTweenToInsert.tweenData.spanWidth = position - prevTween; |
@@ -339,9 +337,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
339 | i = tweensLength; | 337 | i = tweensLength; |
340 | } | 338 | } |
341 | } | 339 | } |
342 | |||
343 | this.application.ninja.currentDocument.model.needsSave = true; | 340 | this.application.ninja.currentDocument.model.needsSave = true; |
344 | |||
345 | for (i = 0; i <= tweensLength + 1; i++) { | 341 | for (i = 0; i <= tweensLength + 1; i++) { |
346 | this.propTweens[i].tweenID = i; | 342 | this.propTweens[i].tweenID = i; |
347 | this.propTweens[i].tweenData.tweenID = i; | 343 | this.propTweens[i].tweenData.tweenID = i; |
@@ -418,8 +414,6 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
418 | 414 | ||
419 | updatePropKeyframeRule:{ | 415 | updatePropKeyframeRule:{ |
420 | value:function(){ | 416 | value:function(){ |
421 | var keyframeString, keyMill, trackDur, keyframePercent, keyframePropertyString, prop, i; | ||
422 | // delete the current rule | ||
423 | this.ninjaStylesContoller.deleteRule(this.currentKeyframeRule); | 417 | this.ninjaStylesContoller.deleteRule(this.currentKeyframeRule); |
424 | 418 | ||
425 | // build the new keyframe string | 419 | // build the new keyframe string |
@@ -438,7 +432,6 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
438 | keyframeString += keyframePropertyString; | 432 | keyframeString += keyframePropertyString; |
439 | } | 433 | } |
440 | keyframeString += " }"; | 434 | keyframeString += " }"; |
441 | // set the keyframe string as the new rule | ||
442 | this.currentKeyframeRule = this.ninjaStylesContoller.addRule(keyframeString); | 435 | this.currentKeyframeRule = this.ninjaStylesContoller.addRule(keyframeString); |
443 | this.application.ninja.currentDocument.model.needsSave = true; | 436 | this.application.ninja.currentDocument.model.needsSave = true; |
444 | } | 437 | } |
@@ -453,9 +446,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
453 | if (currentStyleValue == null) { | 446 | if (currentStyleValue == null) { |
454 | currentStyleValue = "1px"; | 447 | currentStyleValue = "1px"; |
455 | } | 448 | } |
456 | |||
457 | this.propTweens[0].tweenData.tweenedProperties[this.trackEditorProperty] = currentStyleValue; | 449 | this.propTweens[0].tweenData.tweenedProperties[this.trackEditorProperty] = currentStyleValue; |
458 | |||
459 | this.animationName = this.animatedElement.classList[0] + "_" + this.trackEditorProperty; | 450 | this.animationName = this.animatedElement.classList[0] + "_" + this.trackEditorProperty; |
460 | currentAnimationNameString = this.timelineTrack.animationNamesString; | 451 | currentAnimationNameString = this.timelineTrack.animationNamesString; |
461 | newAnimationNames = ""; | 452 | newAnimationNames = ""; |
@@ -481,4 +472,5 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
481 | this.insertPropTween(tweenEvent.offsetX); | 472 | this.insertPropTween(tweenEvent.offsetX); |
482 | } | 473 | } |
483 | } | 474 | } |
475 | /* ===- End Controllers ==== */ | ||
484 | }); | 476 | }); |