Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hopefully fix webpack imports #5

Merged
merged 1 commit into from
Sep 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"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", "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", "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+"]
}
2 changes: 1 addition & 1 deletion dev/build/config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "2.0.5",
"lastupdate": "2015-04-25",
"lastupdate": "2015-04-23",
"info": {
"description": "The javascript library for magical scroll interactions.",
"homepage": "http://ScrollMagic.io",
Expand Down
5 changes: 2 additions & 3 deletions dev/src/plugins/animation.gsap.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,11 @@ if (typeof window === 'undefined') {
(function (root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['ScrollMagic', 'TweenMax', 'TimelineMax'], factory);
define(['scrollmagic', 'gsap/TweenMax', 'gsap/TimelineMax'], factory);
} else if (typeof exports === 'object') {
// CommonJS
// Loads whole gsap package onto global scope.
require('gsap');
factory(require('scrollmagic'), TweenMax, TimelineMax);
factory(require('scrollmagic'), require('gsap/TweenMax'), require('gsap/TimelineMax'));
} else {
// Browser globals
factory(root.ScrollMagic || (root.jQuery && root.jQuery.ScrollMagic), root.TweenMax || root.TweenLite, root.TimelineMax || root.TimelineLite);
Expand Down
2 changes: 1 addition & 1 deletion dev/src/plugins/animation.velocity.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ if (typeof window === 'undefined') {
(function (root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['ScrollMagic', 'velocity'], factory);
define(['scrollmagic', 'velocity'], factory);
} else if (typeof exports === 'object') {
// CommonJS
factory(require('scrollmagic'), require('velocity'));
Expand Down
2 changes: 1 addition & 1 deletion dev/src/plugins/debug.addIndicators.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ if (typeof window === 'undefined') {
(function (root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['ScrollMagic'], factory);
define(['scrollmagic'], factory);
} else if (typeof exports === 'object') {
// CommonJS
factory(require('scrollmagic'));
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "ScrollMagic",
"name": "scrollmagic",
"title": "ScrollMagic",
"version": "2.0.5",
"description": "The javascript library for magical scroll interactions.",
Expand Down Expand Up @@ -61,7 +61,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", "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", "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"]
}
}
2 changes: 1 addition & 1 deletion scrollmagic/uncompressed/ScrollMagic.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* ScrollMagic v2.0.5 (2015-04-25)
* ScrollMagic v2.0.5 (2015-04-23)
* The javascript library for magical scroll interactions.
* (c) 2015 Jan Paepke (@janpaepke)
* Project Website: http://scrollmagic.io
Expand Down
7 changes: 3 additions & 4 deletions scrollmagic/uncompressed/plugins/animation.gsap.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* ScrollMagic v2.0.5 (2015-04-25)
* ScrollMagic v2.0.5 (2015-04-23)
* The javascript library for magical scroll interactions.
* (c) 2015 Jan Paepke (@janpaepke)
* Project Website: http://scrollmagic.io
Expand Down Expand Up @@ -46,12 +46,11 @@ if (typeof window === 'undefined') {
(function (root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['ScrollMagic', 'TweenMax', 'TimelineMax'], factory);
define(['scrollmagic', 'gsap/TweenMax', 'gsap/TimelineMax'], factory);
} else if (typeof exports === 'object') {
// CommonJS
// Loads whole gsap package onto global scope.
require('gsap');
factory(require('scrollmagic'), TweenMax, TimelineMax);
factory(require('scrollmagic'), require('gsap/TweenMax'), require('gsap/TimelineMax'));
} else {
// Browser globals
factory(root.ScrollMagic || (root.jQuery && root.jQuery.ScrollMagic), root.TweenMax || root.TweenLite, root.TimelineMax || root.TimelineLite);
Expand Down
4 changes: 2 additions & 2 deletions scrollmagic/uncompressed/plugins/animation.velocity.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* ScrollMagic v2.0.5 (2015-04-25)
* ScrollMagic v2.0.5 (2015-04-23)
* The javascript library for magical scroll interactions.
* (c) 2015 Jan Paepke (@janpaepke)
* Project Website: http://scrollmagic.io
Expand Down Expand Up @@ -46,7 +46,7 @@ if (typeof window === 'undefined') {
(function (root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['ScrollMagic', 'velocity'], factory);
define(['scrollmagic', 'velocity'], factory);
} else if (typeof exports === 'object') {
// CommonJS
factory(require('scrollmagic'), require('velocity'));
Expand Down
4 changes: 2 additions & 2 deletions scrollmagic/uncompressed/plugins/debug.addIndicators.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* ScrollMagic v2.0.5 (2015-04-25)
* ScrollMagic v2.0.5 (2015-04-23)
* The javascript library for magical scroll interactions.
* (c) 2015 Jan Paepke (@janpaepke)
* Project Website: http://scrollmagic.io
Expand Down Expand Up @@ -39,7 +39,7 @@ if (typeof window === 'undefined') {
(function (root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['ScrollMagic'], factory);
define(['scrollmagic'], factory);
} else if (typeof exports === 'object') {
// CommonJS
factory(require('scrollmagic'));
Expand Down
2 changes: 1 addition & 1 deletion scrollmagic/uncompressed/plugins/jquery.ScrollMagic.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* ScrollMagic v2.0.5 (2015-04-25)
* ScrollMagic v2.0.5 (2015-04-23)
* The javascript library for magical scroll interactions.
* (c) 2015 Jan Paepke (@janpaepke)
* Project Website: http://scrollmagic.io
Expand Down