Skip to content

Commit

Permalink
12.1.3
Browse files Browse the repository at this point in the history
- Fixed an issue that could cause a TimelineLite or TimelineMax not to auto-adjust its startTime when you add a new child and the timeline is already at its end.

- Updated copyright dates
  • Loading branch information
jackdoyle committed Feb 20, 2014
1 parent 24f3371 commit 1e7dc5c
Show file tree
Hide file tree
Showing 127 changed files with 369 additions and 343 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gsap",
"version": "12.1.2",
"version": "12.1.3",
"description": "GreenSock Animation Platform (GSAP) is a suite of high-performance AS3 classes for scripted animation (also available in JavaScript and AS2), including TweenLite, TweenMax, TimelineLite, TimelineMax, various easing equations, and plugins for things like animating along Bezier paths, filters, etc. See http://www.greensock.com/ for details.",
"author": {
"name": "Jack Doyle",
Expand Down
2 changes: 1 addition & 1 deletion src/com/greensock/BlitMask.as
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ package com.greensock {
* be better off just turning off bitmapMode during that animation sequence.</li>
* </ul><br /><br />
*
* <b>Copyright 2011-2013, GreenSock. All rights reserved.</b> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.
* <b>Copyright 2014-2014, GreenSock. All rights reserved.</b> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.
*
* @author Jack Doyle, [email protected]
**/
Expand Down
2 changes: 1 addition & 1 deletion src/com/greensock/FlexBlitMask.as
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ package com.greensock {
* be better off just turning off bitmapMode during that animation sequence.</li>
* </ul><br /><br />
*
* <b>Copyright 2011-2013, GreenSock. All rights reserved.</b> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.
* <b>Copyright 2014-2014, GreenSock. All rights reserved.</b> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.
*
* @author Jack Doyle, [email protected]
**/
Expand Down
20 changes: 10 additions & 10 deletions src/com/greensock/TimelineLite.as
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* VERSION: 12.1.2
* DATE: 2013-12-21
* VERSION: 12.1.3
* DATE: 2014-02-20
* AS3 (AS2 version is also available)
* UPDATES AND DOCS AT: http://www.greensock.com/timelinelite/
**/
Expand Down Expand Up @@ -296,14 +296,14 @@ tl.add(nested);
* and play appropriately, the tween's <code>startTime</code> gets changed to -3. That way, the tween's playhead and the root
* playhead are perfectly aligned. </p>
*
* <p><strong>Copyright 2008-2013, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
* <p><strong>Copyright 2008-2014, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
*
* @author Jack Doyle, [email protected]
*
**/
public class TimelineLite extends SimpleTimeline {
/** @private **/
public static const version:String = "12.1.2";
public static const version:String = "12.1.3";

/** @private **/
protected var _labels:Object;
Expand Down Expand Up @@ -1246,15 +1246,15 @@ tl.add([tween1, tween2, tween3], "+=2", "sequence", 0.5);

super.add(value, position);

//if the timeline has already ended but the inserted tween/timeline extends the duration, we should enable this timeline again so that it renders properly.
if (_gc) if (!_paused) if (_duration < duration()) {
//if the timeline has already ended but the inserted tween/timeline extends the duration, we should enable this timeline again so that it renders properly. We should also align the playhead with the parent timeline's when appropriate.
if (_gc || _time === _duration) if (!_paused) if (_duration < duration()) {
//in case any of the anscestors had completed but should now be enabled...
var tl:SimpleTimeline = this,
beforeRawTime:Boolean = (tl.rawTime() > value._startTime); //if the tween is placed on the timeline so that it starts BEFORE the current rawTime, we should align the playhead (move the timeline). This is because sometimes users will create a timeline, let it finish, and much later append a tween and expect it to run instead of jumping to its end state. While technically one could argue that it should jump to its end state, that's not what users intuitively expect.
while (tl._gc && tl._timeline) {
if (tl._timeline.smoothChildTiming && beforeRawTime) {
while (tl._timeline) {
if (beforeRawTime && tl._timeline.smoothChildTiming) {
tl.totalTime(tl._totalTime, true); //moves the timeline (shifts its startTime) if necessary, and also enables it.
} else {
} else if (tl._gc) {
tl._enabled(true, false);
}
tl = tl._timeline;
Expand Down Expand Up @@ -1290,7 +1290,7 @@ tl.add([tween1, tween2, tween3], "+=2", "sequence", 0.5);
override public function _remove(tween:Animation, skipDisable:Boolean=false):* {
super._remove(tween, skipDisable);
if (_last == null) {
_time = _totalTime = 0;
_time = _totalTime = _duration = _totalDuration = 0;
} else if (_time > _last._startTime + _last._totalDuration / _last._timeScale) {
_time = duration();
_totalTime = _totalDuration;
Expand Down
8 changes: 4 additions & 4 deletions src/com/greensock/TimelineMax.as
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* VERSION: 12.1.2
* DATE: 2013-12-21
* VERSION: 12.1.3
* DATE: 2014-02-20
* AS3 (AS2 version is also available)
* UPDATES AND DOCS AT: http://www.greensock.com/timelinemax/
**/
Expand Down Expand Up @@ -381,14 +381,14 @@ tl.add(nested);
* and play appropriately, the tween's <code>startTime</code> gets changed to -3. That way, the tween's playhead and the root
* playhead are perfectly aligned. </p>
*
* <p><strong>Copyright 2008-2013, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
* <p><strong>Copyright 2008-2014, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
*
* @author Jack Doyle, [email protected]
*
**/
public class TimelineMax extends TimelineLite implements IEventDispatcher {
/** @private **/
public static const version:String = "12.1.2";
public static const version:String = "12.1.3";
/** @private **/
protected static var _listenerLookup:Object = {onCompleteListener:TweenEvent.COMPLETE, onUpdateListener:TweenEvent.UPDATE, onStartListener:TweenEvent.START, onRepeatListener:TweenEvent.REPEAT, onReverseCompleteListener:TweenEvent.REVERSE_COMPLETE};
/** @private **/
Expand Down
2 changes: 1 addition & 1 deletion src/com/greensock/TweenAlign.as
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package com.greensock {
* @private
* Static constants for defining tween alignment.
*
* <p><strong>Copyright 2008-2013, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
* <p><strong>Copyright 2008-2014, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
*
* @author Jack Doyle, [email protected]
**/
Expand Down
8 changes: 4 additions & 4 deletions src/com/greensock/TweenLite.as
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* VERSION: 12.1.2
* DATE: 2013-12-21
* VERSION: 12.1.3
* DATE: 2014-02-20
* AS3 (AS2 version is also available)
* UPDATES AND DOCS AT: http://www.greensock.com
**/
Expand Down Expand Up @@ -297,14 +297,14 @@ package com.greensock {
* <a href="http://www.greensock.com/club/">http://www.greensock.com/club/</a></li>
* </ul>
*
* <p><strong>Copyright 2006-2013, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
* <p><strong>Copyright 2006-2014, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
*
* @author Jack Doyle, [email protected]
*/
public class TweenLite extends Animation {

/** @private **/
public static const version:String = "12.1.2";
public static const version:String = "12.1.3";

/** Provides An easy way to change the default easing equation. Choose from any of the GreenSock eases in the <code>com.greensock.easing</code> package. @default Power1.easeOut **/
public static var defaultEase:Ease = new Ease(null, null, 1, 1);
Expand Down
8 changes: 4 additions & 4 deletions src/com/greensock/TweenMax.as
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* VERSION: 12.1.2
* DATE: 2013-12-21
* VERSION: 12.1.3
* DATE: 2014-02-20
* AS3 (AS2 version is also available)
* UPDATES AND DOCS AT: http://www.greensock.com
**/
Expand Down Expand Up @@ -524,13 +524,13 @@ package com.greensock {
* <a href="http://www.greensock.com/club/">http://www.greensock.com/club/</a></li>
* </ul>
*
* <p><strong>Copyright 2008-2013, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
* <p><strong>Copyright 2008-2014, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
*
* @author Jack Doyle, [email protected]
*/
public class TweenMax extends TweenLite implements IEventDispatcher {
/** @private **/
public static const version:String = "12.1.2";
public static const version:String = "12.1.3";

TweenPlugin.activate([

Expand Down
2 changes: 1 addition & 1 deletion src/com/greensock/TweenNano.as
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ package com.greensock {
* <a href="http://www.greensock.com/club/">http://www.greensock.com/club/</a></li>
* </ul>
*
* <p><strong>Copyright 2008-2013, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
* <p><strong>Copyright 2008-2014, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
*
* @author Jack Doyle, [email protected]
*/
Expand Down
2 changes: 1 addition & 1 deletion src/com/greensock/core/Animation.as
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ tl.add( animateIn() );
tl.add( animateOut(), 3);
</listing>
*
* <p><strong>Copyright 2008-2013, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
* <p><strong>Copyright 2008-2014, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
*
* @author Jack Doyle, [email protected]
*/
Expand Down
2 changes: 1 addition & 1 deletion src/com/greensock/core/PropTween.as
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package com.greensock.core {
* @private
* Stores information about an individual property tween. There is no reason to use this class directly - TweenLite, TweenMax, and some plugins use it internally.
*
* <p><strong>Copyright 2008-2013, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
* <p><strong>Copyright 2008-2014, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
*
* @author Jack Doyle, [email protected]
*/
Expand Down
2 changes: 1 addition & 1 deletion src/com/greensock/core/SimpleTimeline.as
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ package com.greensock.core {
* most basic timeline functionality and it is used for the root timelines in TweenLite but is only
* intended for internal use in the GreenSock tweening platform. It is meant to be very fast and lightweight.
*
* <p><strong>Copyright 2008-2013, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
* <p><strong>Copyright 2008-2014, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
*
* @author Jack Doyle, [email protected]
*/
Expand Down
2 changes: 1 addition & 1 deletion src/com/greensock/data/TweenLiteVars.as
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ package com.greensock.data {
* free to use it. The purpose of this utility is simply to enable code hinting and to allow for strict datatyping.</li>
* </ul>
*
* <p><strong>Copyright 2008-2013, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
* <p><strong>Copyright 2008-2014, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
*
* @author Jack Doyle, [email protected]
*/
Expand Down
2 changes: 1 addition & 1 deletion src/com/greensock/data/TweenMaxVars.as
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ package com.greensock.data {
* free to use it. The purpose of this utility is simply to enable code hinting and to allow for strict datatyping.</li>
* </ul>
*
* <p><strong>Copyright 2008-2013, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
* <p><strong>Copyright 2008-2014, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
*
* @author Jack Doyle, [email protected]
*/
Expand Down
2 changes: 1 addition & 1 deletion src/com/greensock/easing/Back.as
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ package com.greensock.easing {
* <p>You can configure the amount of overshoot using the <code>config()</code> method, like
* <code>TweenLite.to(obj, 1, {x:100, ease:Back.easeOut.config(3)});</code></p>
*
* <p><strong>Copyright 2013, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
* <p><strong>Copyright 2014, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
*
* @author Jack Doyle, [email protected]
**/
Expand Down
2 changes: 1 addition & 1 deletion src/com/greensock/easing/BackIn.as
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package com.greensock.easing {
* @private
* Eases in with an overshoot, initially dipping below the starting value before accelerating towards the end.
*
* <p><strong>Copyright 2013, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
* <p><strong>Copyright 2014, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
*
* @author Jack Doyle, [email protected]
**/
Expand Down
2 changes: 1 addition & 1 deletion src/com/greensock/easing/BackInOut.as
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package com.greensock.easing {
* @private
* Eases in and out with an overshoot, initially dipping below the starting value before accelerating towards the end, overshooting it and easing out.
*
* <p><strong>Copyright 2013, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
* <p><strong>Copyright 2014, GreenSock. All rights reserved.</strong> This work is subject to the terms in <a href="http://www.greensock.com/terms_of_use.html">http://www.greensock.com/terms_of_use.html</a> or for <a href="http://www.greensock.com/club/">Club GreenSock</a> members, the software agreement that was issued with the membership.</p>
*
* @author Jack Doyle, [email protected]
**/
Expand Down
Loading

0 comments on commit 1e7dc5c

Please sign in to comment.