Skip to content

Commit

Permalink
released 2.0.8
Browse files Browse the repository at this point in the history
janpaepke committed Aug 14, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent b0e27ae commit 376d896
Showing 14 changed files with 76 additions and 117 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ScrollMagic <a href='https://github.com/janpaepke/ScrollMagic/blob/master/CHANGELOG.md' class='version' title='Whats New?'>v2.0.7</a> [![Build Status](https://api.travis-ci.org/janpaepke/ScrollMagic.svg?branch=master)](https://travis-ci.org/janpaepke/ScrollMagic)
# ScrollMagic <a href='https://github.com/janpaepke/ScrollMagic/blob/master/CHANGELOG.md' class='version' title='Whats New?'>v2.0.8</a> [![Build Status](https://api.travis-ci.org/janpaepke/ScrollMagic.svg?branch=master)](https://travis-ci.org/janpaepke/ScrollMagic)

### The javascript library for magical scroll interactions.

@@ -82,15 +82,15 @@ npm install scrollmagic
If you don't want to host ScrollMagic yourself, you can include it from [cdnjs](https://cdnjs.com/libraries/ScrollMagic):

```
https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.7/ScrollMagic.min.js
https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.8/ScrollMagic.min.js
```

All plugins and uncompressed files are also available on cdnjs.
For example:

```
https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.7/plugins/debug.addIndicators.js
https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.7/plugins/debug.addIndicators.min.js
https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.8/plugins/debug.addIndicators.js
https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.8/plugins/debug.addIndicators.min.js
```

## Installation
79 changes: 7 additions & 72 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,83 +1,18 @@
{
"name": "scrollmagic",
"version": "2.0.7",
"version": "2.0.8",
"description": "The javascript library for magical scroll interactions.",
"homepage": "http://ScrollMagic.io",
"repository": {
"type": "git",
"url": "https://github.com/janpaepke/ScrollMagic.git"
},
"authors": [
{
"name": "Jan Paepke",
"homepage": "http://www.janpaepke.de"
}
],
"authors": [{
"name": "Jan Paepke",
"homepage": "http://www.janpaepke.de"
}],
"main": "scrollmagic/uncompressed/ScrollMagic.js",
"keywords": [
"scroll",
"scrolling",
"animation",
"sticky",
"pin",
"fixed",
"scrollbar",
"scrub",
"sync",
"position",
"progress",
"parallax",
"events",
"classes",
"jquery-plugin",
"ecosystem:jquery",
"scroll",
"scrolling",
"animation",
"sticky",
"pin",
"fixed",
"scrollbar",
"scrub",
"sync",
"position",
"progress",
"parallax",
"events",
"classes",
"jquery-plugin",
"ecosystem:jquery",
"scroll",
"scrolling",
"animation",
"sticky",
"pin",
"fixed",
"scrollbar",
"scrub",
"sync",
"position",
"progress",
"parallax",
"events",
"classes",
"jquery-plugin",
"ecosystem:jquery"
],
"ignore": [
"**/.*",
"css",
"dev",
"docs",
"examples",
"img",
"js",
"index.html",
"gulpfile.js",
"CONTRIBUTING.md",
"CHANGELOG.md",
"package.json",
"ScrollMagic.jquery.json"
],
"keywords": ["scroll", "scrolling", "animation", "sticky", "pin", "fixed", "scrollbar", "scrub", "sync", "position", "progress", "parallax", "events", "classes", "jquery-plugin", "ecosystem:jquery", "scroll", "scrolling", "animation", "sticky", "pin", "fixed", "scrollbar", "scrub", "sync", "position", "progress", "parallax", "events", "classes", "jquery-plugin", "ecosystem:jquery", "scroll", "scrolling", "animation", "sticky", "pin", "fixed", "scrollbar", "scrub", "sync", "position", "progress", "parallax", "events", "classes", "jquery-plugin", "ecosystem:jquery", "scroll", "scrolling", "animation", "sticky", "pin", "fixed", "scrollbar", "scrub", "sync", "position", "progress", "parallax", "events", "classes", "jquery-plugin", "ecosystem:jquery"],
"ignore": ["**/.*", "css", "dev", "docs", "examples", "img", "js", "index.html", "gulpfile.js", "CONTRIBUTING.md", "CHANGELOG.md", "package.json", "ScrollMagic.jquery.json"],
"license": ["MIT", "GPL-3.0+"]
}
4 changes: 2 additions & 2 deletions dev/build/config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "2.0.7",
"lastupdate": "2019-05-07",
"version": "2.0.8",
"lastupdate": "2020-08-14",
"info": {
"description": "The javascript library for magical scroll interactions.",
"homepage": "http://ScrollMagic.io",
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "scrollmagic",
"title": "ScrollMagic",
"version": "2.0.7",
"version": "2.0.8",
"description": "The javascript library for magical scroll interactions.",
"author": {
"name": "Jan Paepke",
@@ -55,7 +55,7 @@
"start": "node ./node_modules/gulp/bin/gulp open-demo"
},
"homepage": "http://ScrollMagic.io",
"keywords": ["scroll", "scrolling", "animation", "sticky", "pin", "fixed", "scrollbar", "scrub", "sync", "position", "progress", "parallax", "events", "classes", "jquery-plugin", "ecosystem:jquery", "scroll", "scrolling", "animation", "sticky", "pin", "fixed", "scrollbar", "scrub", "sync", "position", "progress", "parallax", "events", "classes", "jquery-plugin", "ecosystem:jquery", "scroll", "scrolling", "animation", "sticky", "pin", "fixed", "scrollbar", "scrub", "sync", "position", "progress", "parallax", "events", "classes", "jquery-plugin", "ecosystem:jquery"],
"keywords": ["scroll", "scrolling", "animation", "sticky", "pin", "fixed", "scrollbar", "scrub", "sync", "position", "progress", "parallax", "events", "classes", "jquery-plugin", "ecosystem:jquery", "scroll", "scrolling", "animation", "sticky", "pin", "fixed", "scrollbar", "scrub", "sync", "position", "progress", "parallax", "events", "classes", "jquery-plugin", "ecosystem:jquery", "scroll", "scrolling", "animation", "sticky", "pin", "fixed", "scrollbar", "scrub", "sync", "position", "progress", "parallax", "events", "classes", "jquery-plugin", "ecosystem:jquery", "scroll", "scrolling", "animation", "sticky", "pin", "fixed", "scrollbar", "scrub", "sync", "position", "progress", "parallax", "events", "classes", "jquery-plugin", "ecosystem:jquery"],
"bugs": "https://github.com/janpaepke/ScrollMagic/issues",
"files": ["scrollmagic", "LICENSE.md", "README.md"]
}
4 changes: 2 additions & 2 deletions scrollmagic/minified/ScrollMagic.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions scrollmagic/minified/plugins/animation.gsap.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scrollmagic/minified/plugins/animation.velocity.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scrollmagic/minified/plugins/debug.addIndicators.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scrollmagic/minified/plugins/jquery.ScrollMagic.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions scrollmagic/uncompressed/ScrollMagic.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*!
* ScrollMagic v2.0.7 (2019-05-07)
* ScrollMagic v2.0.8 (2020-08-14)
* The javascript library for magical scroll interactions.
* (c) 2019 Jan Paepke (@janpaepke)
* (c) 2020 Jan Paepke (@janpaepke)
* Project Website: http://scrollmagic.io
*
* @version 2.0.7
* @version 2.0.8
* @license Dual licensed under MIT license and GPL.
* @author Jan Paepke - [email protected]
*
@@ -31,10 +31,12 @@
_util.log(2, '(COMPATIBILITY NOTICE) -> As of ScrollMagic 2.0.0 you need to use \'new ScrollMagic.Controller()\' to create a new controller instance. Use \'new ScrollMagic.Scene()\' to instance a scene.');
};

ScrollMagic.version = "2.0.7";
ScrollMagic.version = "2.0.8";

// TODO: temporary workaround for chrome's scroll jitter bug
window.addEventListener("mousewheel", function () {});
if (typeof (window) !== 'undefined') {
window.addEventListener("mousewheel", void(0));
}

// global const
var PIN_SPACER_ATTRIBUTE = "data-scrollmagic-pin-spacer";
54 changes: 38 additions & 16 deletions scrollmagic/uncompressed/plugins/animation.gsap.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*!
* ScrollMagic v2.0.7 (2019-05-07)
* ScrollMagic v2.0.8 (2020-08-14)
* The javascript library for magical scroll interactions.
* (c) 2019 Jan Paepke (@janpaepke)
* (c) 2020 Jan Paepke (@janpaepke)
* Project Website: http://scrollmagic.io
*
* @version 2.0.7
* @version 2.0.8
* @license Dual licensed under MIT license and GPL.
* @author Jan Paepke - e-mail@janpaepke.de
*
@@ -28,19 +28,22 @@
(function (root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['ScrollMagic', 'TweenMax', 'TimelineMax'], factory);
define(['ScrollMagic', 'gsap', 'TweenMax', 'TimelineMax'], factory);
} else if (typeof exports === 'object') {
// CommonJS
// Loads whole gsap package onto global scope.
require('gsap');
factory(require('scrollmagic'), TweenMax, TimelineMax);
var gsap = require("gsap/dist/gsap") || require("gsap");

// TweenMax/TimelineMax will be global in v2. In v3, they will be on the gsap object
factory(require('scrollmagic'), gsap, TweenMax || gsap, TimelineMax || gsap);
} else {
// Browser globals
factory(root.ScrollMagic || (root.jQuery && root.jQuery.ScrollMagic), root.TweenMax || root.TweenLite, root.TimelineMax || root.TimelineLite);
factory(root.ScrollMagic || (root.jQuery && root.jQuery.ScrollMagic), root.gsap, root.gsap || root.TweenMax || root.TweenLite, root.gsap || root.TimelineMax || root.TimelineLite);
}
}(this, function (ScrollMagic, Tween, Timeline) {
}(this, function (ScrollMagic, Gsap, Tween, Timeline) {
"use strict";
var NAMESPACE = "animation.gsap";
var GSAP3_OR_GREATER = Gsap && parseFloat(Gsap.version) >= 3;

var
console = window.console || {},
@@ -197,16 +200,33 @@
*/
Scene.setTween = function (TweenObject, duration, params) {
var newTween;

if (arguments.length > 1) {
if (arguments.length < 3) {
params = duration;
duration = 1;
var durationIsSet = typeof arguments['1'] === 'number';

if (GSAP3_OR_GREATER) {
// If we're using gsap 3 with proper gsap 3 syntax of 2 arguments
if (!durationIsSet) {
params = duration;
}
// Add a duration is there isn't one
if (!params.hasOwnProperty('duration')) {
params.duration = durationIsSet ? duration : 1;
}
} else {
// If we're using gsap 2 or earlier syntax
if (arguments.length < 3) {
params = duration;
duration = 1;
}
}
TweenObject = Tween.to(TweenObject, duration, params);

// 2 arguments should be gsap 3 syntax, and 3 arguments for
TweenObject = GSAP3_OR_GREATER ? Tween.to(TweenObject, params) : Tween.to(TweenObject, duration, params);
}
try {
// wrap Tween into a Timeline Object if available to include delay and repeats in the duration and standardize methods.
if (Timeline) {
// wrap Tween into a Timeline Object if not gsap 3 or greater and available to include delay and repeats in the duration and standardize methods.
if (Timeline && !GSAP3_OR_GREATER) {
newTween = new Timeline({
smoothChildTiming: true
})
@@ -254,6 +274,8 @@
// warn about tween overwrites, when an element is tweened multiple times
if (parseFloat(TweenLite.version) >= 1.14) { // onOverwrite only present since GSAP v1.14.0
var
// However, onInterrupt deprecated onOverwrite in GSAP v3
methodUsed = GSAP3_OR_GREATER ? 'onInterrupt' : 'onOverwrite',
list = _tween.getChildren ? _tween.getChildren(true, true, false) : [_tween], // get all nested tween objects
newCallback = function () {
log(2, "WARNING: tween was overwritten by another. To learn how to avoid this issue see here: https://github.com/janpaepke/ScrollMagic/wiki/WARNING:-tween-was-overwritten-by-another");
@@ -262,8 +284,8 @@
/*jshint loopfunc: true */
thisTween = list[i];
if (oldCallback !== newCallback) { // if tweens is added more than once
oldCallback = thisTween.vars.onOverwrite;
thisTween.vars.onOverwrite = function () {
oldCallback = thisTween.vars[methodUsed];
thisTween.vars[methodUsed] = function () {
if (oldCallback) {
oldCallback.apply(this, arguments);
}
6 changes: 3 additions & 3 deletions scrollmagic/uncompressed/plugins/animation.velocity.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*!
* ScrollMagic v2.0.7 (2019-05-07)
* ScrollMagic v2.0.8 (2020-08-14)
* The javascript library for magical scroll interactions.
* (c) 2019 Jan Paepke (@janpaepke)
* (c) 2020 Jan Paepke (@janpaepke)
* Project Website: http://scrollmagic.io
*
* @version 2.0.7
* @version 2.0.8
* @license Dual licensed under MIT license and GPL.
* @author Jan Paepke - e-mail@janpaepke.de
*
6 changes: 3 additions & 3 deletions scrollmagic/uncompressed/plugins/debug.addIndicators.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*!
* ScrollMagic v2.0.7 (2019-05-07)
* ScrollMagic v2.0.8 (2020-08-14)
* The javascript library for magical scroll interactions.
* (c) 2019 Jan Paepke (@janpaepke)
* (c) 2020 Jan Paepke (@janpaepke)
* Project Website: http://scrollmagic.io
*
* @version 2.0.7
* @version 2.0.8
* @license Dual licensed under MIT license and GPL.
* @author Jan Paepke - e-mail@janpaepke.de
*
6 changes: 3 additions & 3 deletions scrollmagic/uncompressed/plugins/jquery.ScrollMagic.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*!
* ScrollMagic v2.0.7 (2019-05-07)
* ScrollMagic v2.0.8 (2020-08-14)
* The javascript library for magical scroll interactions.
* (c) 2019 Jan Paepke (@janpaepke)
* (c) 2020 Jan Paepke (@janpaepke)
* Project Website: http://scrollmagic.io
*
* @version 2.0.7
* @version 2.0.8
* @license Dual licensed under MIT license and GPL.
* @author Jan Paepke - e-mail@janpaepke.de
*

0 comments on commit 376d896

Please sign in to comment.