From 5b78816b883454cba439974b8c0205875fca4c9f Mon Sep 17 00:00:00 2001 From: Brian Zhang Date: Thu, 20 Sep 2018 12:32:00 -0700 Subject: [PATCH] hopefully fix webpack imports --- bower.json | 2 +- dev/build/config.json | 2 +- dev/src/plugins/animation.gsap.js | 5 ++--- dev/src/plugins/animation.velocity.js | 2 +- dev/src/plugins/debug.addIndicators.js | 2 +- package.json | 6 +++--- scrollmagic/uncompressed/ScrollMagic.js | 2 +- scrollmagic/uncompressed/plugins/animation.gsap.js | 7 +++---- scrollmagic/uncompressed/plugins/animation.velocity.js | 4 ++-- scrollmagic/uncompressed/plugins/debug.addIndicators.js | 4 ++-- scrollmagic/uncompressed/plugins/jquery.ScrollMagic.js | 2 +- 11 files changed, 18 insertions(+), 20 deletions(-) diff --git a/bower.json b/bower.json index 94ab58a4..a60adebf 100644 --- a/bower.json +++ b/bower.json @@ -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+"] } \ No newline at end of file diff --git a/dev/build/config.json b/dev/build/config.json index 0ddd02f8..6aa3f213 100644 --- a/dev/build/config.json +++ b/dev/build/config.json @@ -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", diff --git a/dev/src/plugins/animation.gsap.js b/dev/src/plugins/animation.gsap.js index e75caef8..427b7588 100644 --- a/dev/src/plugins/animation.gsap.js +++ b/dev/src/plugins/animation.gsap.js @@ -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); diff --git a/dev/src/plugins/animation.velocity.js b/dev/src/plugins/animation.velocity.js index 0db2fb0f..6490c077 100644 --- a/dev/src/plugins/animation.velocity.js +++ b/dev/src/plugins/animation.velocity.js @@ -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')); diff --git a/dev/src/plugins/debug.addIndicators.js b/dev/src/plugins/debug.addIndicators.js index 4a1a9dd7..e841cbe6 100644 --- a/dev/src/plugins/debug.addIndicators.js +++ b/dev/src/plugins/debug.addIndicators.js @@ -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')); diff --git a/package.json b/package.json index edb456c9..c7c7976c 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "ScrollMagic", + "name": "scrollmagic", "title": "ScrollMagic", "version": "2.0.5", "description": "The javascript library for magical scroll interactions.", @@ -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"] -} +} \ No newline at end of file diff --git a/scrollmagic/uncompressed/ScrollMagic.js b/scrollmagic/uncompressed/ScrollMagic.js index 4f79d35d..eeadfe0b 100644 --- a/scrollmagic/uncompressed/ScrollMagic.js +++ b/scrollmagic/uncompressed/ScrollMagic.js @@ -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 diff --git a/scrollmagic/uncompressed/plugins/animation.gsap.js b/scrollmagic/uncompressed/plugins/animation.gsap.js index d1696a0f..1495cac7 100644 --- a/scrollmagic/uncompressed/plugins/animation.gsap.js +++ b/scrollmagic/uncompressed/plugins/animation.gsap.js @@ -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 @@ -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); diff --git a/scrollmagic/uncompressed/plugins/animation.velocity.js b/scrollmagic/uncompressed/plugins/animation.velocity.js index 3e59bfee..144c2ccb 100644 --- a/scrollmagic/uncompressed/plugins/animation.velocity.js +++ b/scrollmagic/uncompressed/plugins/animation.velocity.js @@ -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 @@ -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')); diff --git a/scrollmagic/uncompressed/plugins/debug.addIndicators.js b/scrollmagic/uncompressed/plugins/debug.addIndicators.js index 77d8607c..0f44c14d 100644 --- a/scrollmagic/uncompressed/plugins/debug.addIndicators.js +++ b/scrollmagic/uncompressed/plugins/debug.addIndicators.js @@ -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 @@ -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')); diff --git a/scrollmagic/uncompressed/plugins/jquery.ScrollMagic.js b/scrollmagic/uncompressed/plugins/jquery.ScrollMagic.js index 55f46d12..4bad6507 100644 --- a/scrollmagic/uncompressed/plugins/jquery.ScrollMagic.js +++ b/scrollmagic/uncompressed/plugins/jquery.ScrollMagic.js @@ -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