From 4ad9d318219d2817bb14c46a88f482117dba4883 Mon Sep 17 00:00:00 2001 From: nobody Date: Sun, 17 Jul 2022 07:29:47 +0200 Subject: [PATCH] jQuery Mobile CSS v1.4.5 (#1063) --- THIRD_PARTY.txt | 1 + core/mappings.js | 14 ++++++++++++-- core/request-analyzer.js | 8 ++++---- core/resources.js | 5 ++++- modules/internal/targets.js | 3 ++- pages/updates/updates.html | 4 ++++ .../jquery-mobile/1.4.5/jquery.mobile.min.css | 3 +++ 7 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 resources/jquery-mobile/1.4.5/jquery.mobile.min.css diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt index d8af4c23..8c50dbdf 100644 --- a/THIRD_PARTY.txt +++ b/THIRD_PARTY.txt @@ -1215,6 +1215,7 @@ https://cdnjs.cloudflare.com/ajax/libs/jquery.lazyload/1.9.1/jquery.lazyload.min https://cdnjs.cloudflare.com/ajax/libs/jquery.matchHeight/0.7.2/jquery.matchHeight-min.js https://cdnjs.cloudflare.com/ajax/libs/jquery-migrate/1.4.1/jquery-migrate.min.js https://cdnjs.cloudflare.com/ajax/libs/jquery-migrate/3.4.0/jquery-migrate.min.js +https://cdnjs.cloudflare.com/ajax/libs/jquery-mobile/1.4.5/jquery.mobile.min.css https://cdnjs.cloudflare.com/ajax/libs/jquery-mobile/1.4.5/jquery.mobile.min.js https://cdnjs.cloudflare.com/ajax/libs/jquery-modal/0.9.2/jquery.modal.min.css https://cdnjs.cloudflare.com/ajax/libs/jquery-modal/0.9.2/jquery.modal.min.js diff --git a/core/mappings.js b/core/mappings.js index 7f1bb1df..d379176d 100644 --- a/core/mappings.js +++ b/core/mappings.js @@ -54,7 +54,10 @@ mappings.cdn = { 'ext-core/{version}/ext-core.': resources.extCore, 'ext-core/{version}/ext-core-debug.': resources.extCore, 'jquery/{version}/jquery.': resources.jQuery, - 'jquerymobile/{version}/jquery.mobile.': resources.jQueryMobile, + 'jquerymobile/{version}/jquery.mobile.min.js': resources.jQueryMobileJS, + 'jquerymobile/{version}/jquery.mobile.js': resources.jQueryMobileJS, + 'jquerymobile/{version}/jquery.mobile.min.css': resources.jQueryMobileCSS, + 'jquerymobile/{version}/jquery.mobile.css': resources.jQueryMobileCSS, 'jqueryui/{version}/jquery-ui.js': resources.jQueryUI, 'jqueryui/{version}/jquery-ui.min.js': resources.jQueryUI, 'jqueryui/{version}/themes/base/minified/jquery-ui.min.css': resources.jQueryUiThemes, @@ -350,6 +353,10 @@ mappings.cdn = { 'jquery-modal/{version}/jquery.modal.min.js': resources.jQueryModalJS, 'jquery-modal/{version}/jquery.modal.css': resources.jQueryModalCSS, 'jquery-modal/{version}/jquery.modal.min.css': resources.jQueryModalCSS, + 'jquery-mobile/{version}/jquery.mobile.min.js': resources.jQueryMobileJS, + 'jquery-mobile/{version}/jquery.mobile.js': resources.jQueryMobileJS, + 'jquery-mobile/{version}/jquery.mobile.min.css': resources.jQueryMobileCSS, + 'jquery-mobile/{version}/jquery.mobile.css': resources.jQueryMobileCSS, 'jquery-mousewheel/{version}/jquery.mousewheel.min.js': resources.jqueryMousewheelJS, 'jquery-cookie/{version}/jquery.cookie.': resources.jqueryCookie, 'jquery.scrollbar/{version}/jquery.scrollbar.min.js': resources.jQueryScrollbar, @@ -507,7 +514,10 @@ mappings.cdn = { '/': { 'jquery-{version}.': resources.jQuery, 'ui/{version}/jquery-ui.': resources.jQueryUI, - 'mobile/{version}/jquery.mobile': resources.jQueryMobile, + 'mobile/{version}/jquery.mobile-{version}.min.js': resources.jQueryMobileJS, + 'mobile/{version}/jquery.mobile-{version}.js': resources.jQueryMobileJS, + 'mobile/{version}/jquery.mobile-{version}.min.css': resources.jQueryMobileCSS, + 'mobile/{version}/jquery.mobile-{version}.css': resources.jQueryMobileCSS, 'jquery-migrate-{version}.': resources.jQueryMigrate } }, diff --git a/core/request-analyzer.js b/core/request-analyzer.js index bf85910c..79950274 100644 --- a/core/request-analyzer.js +++ b/core/request-analyzer.js @@ -158,10 +158,10 @@ requestAnalyzer._findLocalTarget = function (resourceMappings, basePath, channel // Handle weird version expressions if (!versionNumber && Resource.SINGLE_NUMBER_EXPRESSION.test(channelPath)) { versionNumber = channelPath.match(/\d/); - resourcePattern = resourcePath.replace(versionNumber, Resource.VERSION_PLACEHOLDER); + resourcePattern = resourcePath.replaceAll(versionNumber, Resource.VERSION_PLACEHOLDER); versionNumber = [`${versionNumber}.0`]; } else { - resourcePattern = resourcePath.replace(versionNumber, Resource.VERSION_PLACEHOLDER); + resourcePattern = resourcePath.replaceAll(versionNumber, Resource.VERSION_PLACEHOLDER); } shorthandResource = shorthands.specialFiles(channelHost, channelPath, destinationSearchString); @@ -181,7 +181,7 @@ requestAnalyzer._findLocalTarget = function (resourceMappings, basePath, channel if (resourcePattern.startsWith(resourceMold)) { let targetPath, versionDelivered, versionRequested, bundle; targetPath = resourceMappings[resourceMold].path; - targetPath = targetPath.replace(Resource.VERSION_PLACEHOLDER, versionNumber); + targetPath = targetPath.replaceAll(Resource.VERSION_PLACEHOLDER, versionNumber); // Replace the requested version with the latest depending on major version versionDelivered = targets.setLastVersion(targetPath, versionNumber); if (versionDelivered === '') { @@ -190,7 +190,7 @@ requestAnalyzer._findLocalTarget = function (resourceMappings, basePath, channel }; } - targetPath = targetPath.replace(versionNumber, versionDelivered); + targetPath = targetPath.replaceAll(versionNumber, versionDelivered); if (versionNumber === null) { versionDelivered = targetPath.match(Resource.VERSION_EXPRESSION).toString(); diff --git a/core/resources.js b/core/resources.js index 7742625b..181167e3 100644 --- a/core/resources.js +++ b/core/resources.js @@ -632,9 +632,12 @@ var resources = { 'path': 'resources/jquery-validate/{version}/jquery.validate.min.jsm' }, // jQuery Mobile [Deprecated] - 'jQueryMobile': { + 'jQueryMobileJS': { 'path': 'resources/jquery-mobile/{version}/jquery.mobile.min.jsm' }, + 'jQueryMobileCSS': { + 'path': 'resources/jquery-mobile/{version}/jquery.mobile.min.css' + }, // jquery-validation-unobtrusive 'jQueryValidationUnobtrusive': { 'path': 'resources/jquery-validation-unobtrusive/{version}/jquery.validate.unobtrusive.min.jsm' diff --git a/modules/internal/targets.js b/modules/internal/targets.js index 5f8b31e5..0d167792 100644 --- a/modules/internal/targets.js +++ b/modules/internal/targets.js @@ -705,7 +705,8 @@ const ListOfFiles = { 'jquery.jeditable.min.jsm': 'jQuery Validation Plugin', 'jquery.lazyload.min.jsm': 'jQuery Lazy Load', 'jquery.min.jsm': 'jQuery', - 'jquery.mobile.min.jsm': 'jQuery Mobile', + 'jquery.mobile.min.jsm': 'jQuery Mobile (JS)', + 'jquery.mobile.min.css': 'jQuery Mobile (CSS)', 'jquery.modal.min.css': 'jQuery Modal', 'jquery.modal.min.jsm': 'jQuery Modal', 'jquery.tablesorter.min.jsm': 'jQuery Tablesorter', diff --git a/pages/updates/updates.html b/pages/updates/updates.html index 7e2a3860..67f5d4fa 100644 --- a/pages/updates/updates.html +++ b/pages/updates/updates.html @@ -36,6 +36,10 @@
  • instantsearch.js v4.43.0 -> v4.43.1 (#1061)
  • libphonenumber-js v1.10.7 -> v1.10.8 (#1062)
    • +

    Added

    +

    Improved