-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
76 additions
and
117 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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+"] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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"; | ||
|
Oops, something went wrong.