Skip to content
Snippets Groups Projects
Commit 4cfed2c1 authored by catch's avatar catch
Browse files

Issue #3382447 by gapple, acbramley, nod_, catch: Libraries using jquery_ui... 

Issue #3382447 by gapple, acbramley, nod_, catch: Libraries using jquery_ui assets directly shouldn't duplicate files
parent da456f43
Branches
Tags
17 merge requests!11628Update file MediaLibraryWidget.php,!7564Revert "Issue #3364773 by roshnichordiya, Chris Matthews, thakurnishant_06,...,!5752Issue #3275828 by joachim, quietone, bradjones1, Berdir: document the reason...,!5627Issue #3261805: Field not saved when change of 0 on string start,!5427Issue #3338518: send credentials in ajax if configured in CORS settings.,!5395Issue #3387916 by fjgarlin, Spokje: Each GitLab job exposes user email,!5217Issue #3386607 by alexpott: Improve spell checking in commit-code-check.sh,!5064Issue #3379522 by finnsky, Gauravvvv, kostyashupenko, smustgrave, Chi: Revert...,!5040SDC ComponentElement: Transform slots scalar values to #plain_text instead of throwing an exception,!4958Issue #3392147: Whitelist IP for a Ban module.,!4894Issue #3280279: Add API to allow sites to opt in to upload SVG images in CKEditor 5,!4857Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!4856Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3679Issue #115801: Allow password on registration without disabling e-mail verification,!3106Issue #3017548: "Filtered HTML" text format does not support manual teaser break (<!--break-->),!925Issue #2339235: Remove taxonomy hard dependency on node module,!872Draft: Issue #3221319: Race condition when creating menu links and editing content deletes menu links
Pipeline #20117 passed
Stage: test
Pipeline: drupal

#20118

    Hide whitespace changes
    Inline Side-by-side
    core/core.libraries.yml
    + 27
    − 32
    View file @ 4cfed2c1
    ......@@ -406,42 +406,54 @@ loadjs:
    js:
    assets/vendor/loadjs/loadjs.min.js: { minified: true }
    drupal.autocomplete:
    # Common files for libraries that still rely on jQuery UI components.
    # @todo Remove when no longer required by drupal.autocomplete and drupal.dialog.
    internal.jquery_ui:
    version: VERSION
    js:
    misc/autocomplete.js: { weight: -1 }
    # The remaining JavaScript assets previously came from core/jquery.ui, a
    # deprecated library.
    # All weights are based on the requirements defined within each file.
    # @todo replace with solution in https://drupal.org/node/3076171
    assets/vendor/jquery.ui/ui/widgets/autocomplete-min.js: { weight: -11.7, minified: true }
    assets/vendor/jquery.ui/ui/labels-min.js: { weight: -11.7, minified: true }
    assets/vendor/jquery.ui/ui/widgets/menu-min.js: { weight: -11.7, minified: true }
    assets/vendor/jquery.ui/ui/data-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/disable-selection-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/focusable-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/form-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/ie-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/jquery-patch-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/scroll-parent-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/unique-id-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/focusable-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/ie-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/keycode-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/plugin-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/safe-active-element-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/safe-blur-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/scroll-parent-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/unique-id-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/widget-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/version-min.js: { weight: -11.9, minified: true }
    css:
    component:
    assets/vendor/jquery.ui/themes/base/core.css: { weight: -11.8 }
    theme:
    assets/vendor/jquery.ui/themes/base/theme.css: { weight: -11.8 }
    dependencies:
    - core/jquery
    drupal.autocomplete:
    version: VERSION
    js:
    misc/autocomplete.js: { weight: -1 }
    # The remaining JavaScript assets previously came from core/jquery.ui, a
    # deprecated library.
    # All weights are based on the requirements defined within each file.
    # @todo replace with solution in https://drupal.org/node/3076171
    assets/vendor/jquery.ui/ui/widgets/autocomplete-min.js: { weight: -11.7, minified: true }
    assets/vendor/jquery.ui/ui/widgets/menu-min.js: { weight: -11.7, minified: true }
    # All CSS assets previously came from core/jquery.ui, a deprecated library.
    # @todo replace with solution found in https://drupal.org/node/3076171
    css:
    component:
    assets/vendor/jquery.ui/themes/base/autocomplete.css: { weight: -11.7 }
    assets/vendor/jquery.ui/themes/base/menu.css: { weight: -11.7 }
    assets/vendor/jquery.ui/themes/base/core.css: { weight: -11.8 }
    theme:
    assets/vendor/jquery.ui/themes/base/theme.css: { weight: -11.8 }
    dependencies:
    - core/jquery
    - core/internal.jquery_ui
    - core/drupal
    - core/drupalSettings
    - core/drupal.ajax
    ......@@ -519,22 +531,7 @@ drupal.dialog:
    assets/vendor/jquery.ui/ui/widgets/resizable-min.js: { weight: -11.6, minified: true }
    assets/vendor/jquery.ui/ui/widgets/controlgroup-min.js: { weight: -11.7, minified: true }
    assets/vendor/jquery.ui/ui/form-reset-mixin-min.js: { weight: -11.7, minified: true }
    assets/vendor/jquery.ui/ui/labels-min.js: { weight: -11.7, minified: true }
    assets/vendor/jquery.ui/ui/widgets/mouse-min.js: { weight: -11.7, minified: true }
    assets/vendor/jquery.ui/ui/data-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/disable-selection-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/form-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/jquery-patch-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/scroll-parent-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/unique-id-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/focusable-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/ie-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/keycode-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/plugin-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/safe-active-element-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/safe-blur-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/widget-min.js: { weight: -11.8, minified: true }
    assets/vendor/jquery.ui/ui/version-min.js: { weight: -11.9, minified: true }
    # All CSS assets previously came from core/jquery.ui, a deprecated library.
    # @todo replace with solution found in https://drupal.org/node/2158943
    css:
    ......@@ -544,11 +541,9 @@ drupal.dialog:
    assets/vendor/jquery.ui/themes/base/checkboxradio.css: { weight: -11.6 }
    assets/vendor/jquery.ui/themes/base/resizable.css: { weight: -11.6 }
    assets/vendor/jquery.ui/themes/base/controlgroup.css: { weight: -11.7 }
    assets/vendor/jquery.ui/themes/base/core.css: { weight: -11.8 }
    theme:
    assets/vendor/jquery.ui/themes/base/theme.css: { weight: -11.8 }
    dependencies:
    - core/jquery
    - core/internal.jquery_ui
    - core/drupal
    - core/drupalSettings
    - core/drupal.debounce
    ......
    core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php
    + 1
    − 0
    View file @ 4cfed2c1
    ......@@ -56,6 +56,7 @@ protected function setUp(): void {
    // All the core libraries that use jQuery UI assets.
    $libraries_to_check = [
    'internal.jquery_ui',
    'drupal.autocomplete',
    'drupal.dialog',
    ];
    ......
    core/themes/claro/claro.info.yml
    + 1
    − 8
    View file @ 4cfed2c1
    ......@@ -47,12 +47,7 @@ libraries-override:
    component:
    misc/vertical-tabs.css: false
    core/drupal.autocomplete:
    css:
    theme:
    assets/vendor/jquery.ui/themes/base/theme.css: false
    core/drupal.tabbingmanager:
    core/internal.jquery_ui:
    css:
    theme:
    assets/vendor/jquery.ui/themes/base/theme.css: false
    ......@@ -61,8 +56,6 @@ libraries-override:
    css:
    component:
    assets/vendor/jquery.ui/themes/base/dialog.css: false
    theme:
    assets/vendor/jquery.ui/themes/base/theme.css: false
    user/drupal.user:
    css:
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment