diff --git a/dev/src/plugins/animation.gsap.js b/dev/src/plugins/animation.gsap.js index b5aab675..e7635fb4 100644 --- a/dev/src/plugins/animation.gsap.js +++ b/dev/src/plugins/animation.gsap.js @@ -122,9 +122,9 @@ state = Scene.state(); if (_tween.repeat && _tween.repeat() === -1) { // infinite loop, so not in relation to progress - if (state === SCENE_STATE_DURING && _tween.paused()) { + if (state === 'DURING' && _tween.paused()) { _tween.play(); - } else if (state !== SCENE_STATE_DURING && !_tween.paused()) { + } else if (state !== 'DURING' && !_tween.paused()) { _tween.pause(); } } else if (progress != _tween.progress()) { // do we even need to update the progress? diff --git a/dev/todo.md b/dev/todo.md index d4d1e3b6..92f9ab14 100644 --- a/dev/todo.md +++ b/dev/todo.md @@ -18,8 +18,8 @@ - run test a couple of times `gulp test` - commit - push -- add git tag -- push tags [optional: edit tag on GitHub] +- add git tag `git tag v2.0.x` +- push tags `git push origin --tags` [optional: edit tag on GitHub] - update gh-pages - push stub files to gh-pages/js diff --git a/scrollmagic/minified/plugins/animation.gsap.min.js b/scrollmagic/minified/plugins/animation.gsap.min.js index cb5c3923..f40978c3 100644 --- a/scrollmagic/minified/plugins/animation.gsap.min.js +++ b/scrollmagic/minified/plugins/animation.gsap.min.js @@ -1,3 +1,3 @@ /*! ScrollMagic v2.0.4 | (c) 2015 Jan Paepke (@janpaepke) | license & info: http://scrollmagic.io */ -!function(e,n){"function"==typeof define&&define.amd?define(["ScrollMagic","TweenMax","TimelineMax"],n):"object"==typeof exports?(require("gsap"),n(require("scrollmagic"),TweenMax,TimelineMax)):n(e.ScrollMagic||e.jQuery&&e.jQuery.ScrollMagic,e.TweenMax||e.TweenLite,e.TimelineMax||e.TimelineLite)}(this,function(e,n,r){"use strict";e.Scene.addOption("tweenChanges",!1,function(e){return!!e}),e.Scene.extend(function(){var e,t=this;t.on("progress.plugin_gsap",function(){i()}),t.on("destroy.plugin_gsap",function(e){t.removeTween(e.reset)});var i=function(){if(e){var n=t.progress(),r=t.state();e.repeat&&-1===e.repeat()?r===SCENE_STATE_DURING&&e.paused()?e.play():r===SCENE_STATE_DURING||e.paused()||e.pause():n!=e.progress()&&(0===t.duration()?n>0?e.play():e.reverse():t.tweenChanges()&&e.tweenTo?e.tweenTo(n*e.duration()):e.progress(n).pause())}};t.setTween=function(o,a,s){var u;arguments.length>1&&(arguments.length<3&&(s=a,a=1),o=n.to(o,a,s));try{u=r?new r({smoothChildTiming:!0}).add(o):o,u.pause()}catch(p){return t}return e&&t.removeTween(),e=u,o.repeat&&-1===o.repeat()&&(e.repeat(-1),e.yoyo(o.yoyo())),i(),t},t.removeTween=function(n){return e&&(n&&e.progress(0).pause(),e.kill(),e=void 0),t}})}); \ No newline at end of file +!function(e,n){"function"==typeof define&&define.amd?define(["ScrollMagic","TweenMax","TimelineMax"],n):"object"==typeof exports?(require("gsap"),n(require("scrollmagic"),TweenMax,TimelineMax)):n(e.ScrollMagic||e.jQuery&&e.jQuery.ScrollMagic,e.TweenMax||e.TweenLite,e.TimelineMax||e.TimelineLite)}(this,function(e,n,r){"use strict";e.Scene.addOption("tweenChanges",!1,function(e){return!!e}),e.Scene.extend(function(){var e,t=this;t.on("progress.plugin_gsap",function(){i()}),t.on("destroy.plugin_gsap",function(e){t.removeTween(e.reset)});var i=function(){if(e){var n=t.progress(),r=t.state();e.repeat&&-1===e.repeat()?"DURING"===r&&e.paused()?e.play():"DURING"===r||e.paused()||e.pause():n!=e.progress()&&(0===t.duration()?n>0?e.play():e.reverse():t.tweenChanges()&&e.tweenTo?e.tweenTo(n*e.duration()):e.progress(n).pause())}};t.setTween=function(o,a,s){var u;arguments.length>1&&(arguments.length<3&&(s=a,a=1),o=n.to(o,a,s));try{u=r?new r({smoothChildTiming:!0}).add(o):o,u.pause()}catch(p){return t}return e&&t.removeTween(),e=u,o.repeat&&-1===o.repeat()&&(e.repeat(-1),e.yoyo(o.yoyo())),i(),t},t.removeTween=function(n){return e&&(n&&e.progress(0).pause(),e.kill(),e=void 0),t}})}); \ No newline at end of file diff --git a/scrollmagic/uncompressed/plugins/animation.gsap.js b/scrollmagic/uncompressed/plugins/animation.gsap.js index 682b7cf8..ca38f5ec 100644 --- a/scrollmagic/uncompressed/plugins/animation.gsap.js +++ b/scrollmagic/uncompressed/plugins/animation.gsap.js @@ -128,9 +128,9 @@ state = Scene.state(); if (_tween.repeat && _tween.repeat() === -1) { // infinite loop, so not in relation to progress - if (state === SCENE_STATE_DURING && _tween.paused()) { + if (state === 'DURING' && _tween.paused()) { _tween.play(); - } else if (state !== SCENE_STATE_DURING && !_tween.paused()) { + } else if (state !== 'DURING' && !_tween.paused()) { _tween.pause(); } } else if (progress != _tween.progress()) { // do we even need to update the progress?