diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt index fd8a7171..2fbf1909 100644 --- a/THIRD_PARTY.txt +++ b/THIRD_PARTY.txt @@ -1497,6 +1497,10 @@ https://cdnjs.cloudflare.com/ajax/libs/rickshaw/1.7.1/rickshaw.min.css https://cdnjs.cloudflare.com/ajax/libs/rickshaw/1.7.1/rickshaw.min.js https://cdnjs.cloudflare.com/ajax/libs/scriptaculous/1.9.0/scriptaculous.js https://cdnjs.cloudflare.com/ajax/libs/script.js/2.5.9/script.min.js +https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.8/plugins/animation.gsap.min.js +https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.8/plugins/animation.velocity.min.js +https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.8/plugins/jquery.ScrollMagic.min.js +https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.8/ScrollMagic.min.js https://cdnjs.cloudflare.com/ajax/libs/select2/3.5.4/select2-bootstrap.min.css https://cdnjs.cloudflare.com/ajax/libs/select2/3.5.4/select2_locale_ar.min.js https://cdnjs.cloudflare.com/ajax/libs/select2/3.5.4/select2_locale_az.min.js diff --git a/audit/audit.sh b/audit/audit.sh index 3feb3b44..69036d96 100755 --- a/audit/audit.sh +++ b/audit/audit.sh @@ -739,6 +739,8 @@ function create_url() { url="$JSDELIVR/npm/in-view@$version/dist/in-view.min.js" elif [ "$folder" = "knockout" ] && [ "$version" = "3.5.1" ];then url="$CLOUDFLARE/$folder/$version/knockout-latest.min.js" + elif [ "$folder" = "ScrollMagic" ] && [ "$jfile" != "ScrollMagic.min.js" ];then + url="$CLOUDFLARE/$folder/$version/plugins/$jfile" # -------------------------------------------------------------------------- else if [ "$subfile" = "$jfile" ]; then diff --git a/core/mappings.js b/core/mappings.js index 2efd0447..d4f82a9c 100644 --- a/core/mappings.js +++ b/core/mappings.js @@ -463,6 +463,7 @@ mappings.cdn = { 'rickshaw/{version}/rickshaw.min.js': resources.rickshawJS, 'script.js/{version}/script.': resources.scriptJS, 'scriptaculous/{version}/scriptaculous.': resources.scriptaculous, + 'ScrollMagic/{version}/': resources.scrollMagic, 'select2/{version}/': resources.select2, 'semantic-ui/{version}/': resources.semanticUi, 'showdown/{version}/showdown.': resources.showdown, @@ -682,6 +683,8 @@ mappings.cdn = { 'react-dom@{version}/umd/react-dom.production.min.js': resources.reactDOM, 'react-intl@{version}/react-intl.iife.': resources.reactIntl, 'react@{version}/umd/react.production.min.js': resources.react, + 'scrollmagic@{version}/scrollmagic/uncompressed/': resources.scrollMagic, + 'scrollmagic@{version}/scrollmagic/minified/': resources.scrollMagic, 'search-insights@{version}/dist/search-insights.': resources.searchInsights, 'select2@{version}/': resources.select2, 'swagger-ui-dist@{version}/swagger-ui.js': resources.swaggerUiJS, diff --git a/core/request-analyzer.js b/core/request-analyzer.js index 60b4b03e..5255abe4 100644 --- a/core/request-analyzer.js +++ b/core/request-analyzer.js @@ -241,7 +241,9 @@ requestAnalyzer._getPathOfBundle = function (initiator, channelHost, channelPath } else if (bundle === 'TinyMCE (Bundle)' && filename !== 'tinymce.min.js') { filename = requestAnalyzer._handleTinyMCE(channelPath, channelHost, initiator); } else if (bundle === 'DataTables (Bundle)') { - filename = requestAnalyzer._handleDataTables(filename); + filename = requestAnalyzer._handleUncompressedFiles(filename); + } else if (bundle === 'ScrollMagic (Bundle)' && !filename.endsWith('.min.js')) { + filename = requestAnalyzer._handleUncompressedFiles(filename); } if (filename === false) { @@ -271,7 +273,7 @@ requestAnalyzer._handleMathJax = function (channelPath, channelHost, initiator) return filename; }; -requestAnalyzer._handleDataTables = function (filename) { +requestAnalyzer._handleUncompressedFiles = function (filename) { if (!filename.endsWith('.min.js') && filename.endsWith('.js')) { return filename.replace('.js', '.min.js'); } else if (!filename.endsWith('.min.css') && filename.endsWith('.css')) { diff --git a/core/resources.js b/core/resources.js index b3790119..c8f6e244 100644 --- a/core/resources.js +++ b/core/resources.js @@ -972,6 +972,10 @@ var resources = { 'scriptaculous': { 'path': 'resources/scriptaculous/{version}/scriptaculous.jsm' }, + // ScrollMagic (Bundle) + 'scrollMagic': { + 'path': 'resources/ScrollMagic/{version}/' + }, // Search Insights 'searchInsights': { 'path': 'resources/search-insights/{version}/search-insights.min.jsm' diff --git a/modules/internal/targets.js b/modules/internal/targets.js index 0c85a4d6..3767a01c 100644 --- a/modules/internal/targets.js +++ b/modules/internal/targets.js @@ -67,6 +67,8 @@ targets.determineBundle = function (path) { val = 'vex'; } else if (path.startsWith('/tinymce/')) { val = 'TinyMCE'; + } else if (path.startsWith('/ScrollMagic/')) { + val = 'ScrollMagic'; } return val === '' ? val : `${val} (Bundle)`; @@ -414,6 +416,7 @@ targets.setLastVersion = function (type, version) { if (type.startsWith('/rickshaw/1.')) return '1.7.1'; if (type.startsWith('/script.js/2.')) return '2.5.9'; if (type.startsWith('/scriptaculous/1.')) return '1.9.0'; + if (type.startsWith('/ScrollMagic/2.')) return '2.0.8'; if (type.startsWith('/search-insights/1.')) return '1.8.0'; if (type.startsWith('/search-insights/2.')) return '2.2.3'; if (type.startsWith('/select2/3.')) return '3.5.4'; diff --git a/pages/updates/updates.html b/pages/updates/updates.html index eb2219c7..7db8ae6d 100644 --- a/pages/updates/updates.html +++ b/pages/updates/updates.html @@ -49,6 +49,7 @@

Improved