Skip to content
Snippets Groups Projects
Commit 00991b9d authored by catch's avatar catch
Browse files

Issue #3280359 by bnjmnm: Make jQuery.form internal

(cherry picked from commit 01512edb)
parent f88b9582
No related branches found
No related tags found
42 merge requests!85673265330-fix-missing-hyphens: Create patch to MR and fix remaining words,!8394[warning] array_flip(): Can only flip STRING and INTEGER values, when saving a non-revisionable custom content entity,!7780issue 3443822: fix for 'No route found for the specified format html. Supported formats: json, xml.',!7416Simplify the HTML of field.html.twig,!7150Revert "Issue #3137119 by munish.kumar, johnwebdev, Jaypan, jungle, xjm,...,!6445Issue #3034692: Renamed the getHandler function which return the configuration of a handler instance on given display,!5013Issue #3071143: Table Render Array Example Is Incorrect,!4848Issue #1566662: Update module should send notifications on Thursdays,!4792Issue #2230689: Remove redundant "Italic" style,!4782Issue #2662898: "Links" field not displaying on custom view modes,!4220Issue #3368223: Link field > Access to internal links is not checked on display.,!4173Issue #2123543: Add string context and location filters to the translate interface,!3884Issue #3356842,!3870Issue #3087868,!3812Draft: Issue #3339373 by alexpott, andypost, mondrake:...,!3736Issue #3294005: Refactor Claro's form--password-confirm stylesheet,!3686Issue #3219967 against 9.5.x,!3683Issue #2939397: Clearing AliasManager cache with root path raises warning,!3543Issue #3344259: Allow ajax dialog to have focus configurable,!3437Issue #3106205: Length of menu_tree.url and menu_tree.route_param_key are too short (255 characters),!3356Issue #3209129: Scrolling problems when adding a block via layout builder,!2982Issue #3301562: Translate the default settings for this plugin (TimestampAgoFormatter),!2921Issue #1383696: Allow a custom HTML element to be selected for a grouping field,!2920Issue #3260175: Saving media entity without an owner crashes,!2857Issue #3314541: Remove unnecessary fill from SVG icon for the "Media Library" CKEditor 5 button — enabling dark mode support in contrib,!2841Resolve #3296811 "Resourceresponsetrait needs a",!2803Issue #3041402: Add option absolute url in formatter URL to image,!2733Issue #3293855: Update the outdated user_help text for user.admin_permissions and the description of the select box on the role settings page,!2527Issue #3298714: Undefined #options and Count Warning in Radios.php,!2447Issue #3293135: shouldUpdateThumbnail does not update thumbnail is source field changed,!2428Issue #3032078: Multiple webheads can cause infinite growth of Twig cache,!2280Issue #3280415: Metapackage Generator Breaks Under Composer --no-dev,!2205Quote all names in the regions section.,!2050Issue #3272969: Remove UnqiueField constraint.,!1956Issue #3268872: hook_views_invalidate_cache not called when a view is deleted,!1893Issue #3217260: Add a way to make media captions not editable in CKEditor,!1690fixing include_source documentation at SubProcess.php,!1520Issue #2815221: Add ability to use Quick Edit to the latest_revision route,!1459Issue #3087632: menu_name max length is too long,!878Issue #3221534: throw an exception when IDs passed to loadMultiple() are badly formed,!866Issue #2845319: The highlighting of the 'Home' menu-link does not respect query strings and fragment identifiers,!204Issue #3040556: It is not possible to react to an entity being duplicated
......@@ -842,6 +842,20 @@ jquery.form:
assets/vendor/jquery-form/jquery.form.min.js: { minified: true }
dependencies:
- core/jquery
deprecated: The %library_id% asset library is deprecated in Drupal 9.4.0 and will be removed in Drupal 10.0.0.
internal.jquery.form:
# Internal library. Do not depend on it outside core nor add new core usage.
remote: https://github.com/jquery-form/form
version: "4.3.0"
license:
name: GNU-GPL-2.0-or-later
url: https://raw.githubusercontent.com/jquery-form/form/master/LICENSE
gpl-compatible: true
js:
assets/vendor/jquery-form/jquery.form.min.js: { minified: true }
dependencies:
- core/jquery
jquery.joyride:
remote: https://github.com/zurb/joyride
......
......@@ -326,7 +326,7 @@ public static function preRenderAjaxForm($element) {
// Attach JavaScript settings to the element.
if (isset($element['#ajax']['event'])) {
$element['#attached']['library'][] = 'core/jquery.form';
$element['#attached']['library'][] = 'core/internal.jquery.form';
$element['#attached']['library'][] = 'core/drupal.ajax';
$settings = $element['#ajax'];
......
......@@ -32,7 +32,7 @@ quickedit:
- core/jquery.once.bc
- core/internal.underscore
- core/internal.backbone
- core/jquery.form
- core/internal.jquery.form
- core/drupal
- core/drupal.displace
- core/drupal.form
......
......@@ -174,7 +174,7 @@ function common_test_library_info_alter(&$libraries, $module) {
// Change the version of Farbtastic to 0.0.
$libraries['jquery.farbtastic']['version'] = '0.0';
// Make Farbtastic depend on jQuery Form to test library dependencies.
$libraries['jquery.farbtastic']['dependencies'][] = 'core/jquery.form';
$libraries['jquery.farbtastic']['dependencies'][] = 'core/internal.jquery.form';
}
// Alter the dynamically registered library definition.
......
......@@ -15,5 +15,5 @@ views.ajax:
- core/drupalSettings
- core/once
- core/jquery.once.bc
- core/jquery.form
- core/internal.jquery.form
- core/drupal.ajax
......@@ -10,7 +10,7 @@ views_ui.admin:
- core/drupalSettings
- core/once
- core/jquery.once.bc
- core/jquery.form
- core/internal.jquery.form
- core/drupal.form
- core/drupal.ajax
- core/drupal.dropbutton
......
......@@ -120,13 +120,17 @@ const assetsFolder = `${coreFolder}/assets/vendor`;
},
{
pack: 'jquery-form',
library: 'jquery.form',
library: 'internal.jquery.form',
files: [
{ from: 'dist/jquery.form.min.js', to: 'jquery.form.min.js' },
{ from: 'dist/jquery.form.min.js.map', to: 'jquery.form.min.js.map' },
{ from: 'src/jquery.form.js', to: 'src/jquery.form.js' },
],
},
// Only used to update the version number of the deprecated library.
{
pack: 'jquery-form',
},
{
pack: 'joyride',
folder: 'jquery-joyride',
......
<?php
namespace Drupal\KernelTests\Core\Asset;
use Drupal\KernelTests\KernelTestBase;
/**
* Checks the deprecation status of jQuery.form.
*
* @group Asset
* @group legacy
*/
class DeprecatedJqueryFormTest extends KernelTestBase {
/**
* The library discovery service.
*
* @var \Drupal\Core\Asset\LibraryDiscoveryInterface
*/
protected $libraryDiscovery;
/**
* {@inheritdoc}
*/
protected function setUp():void {
parent::setUp();
$this->libraryDiscovery = $this->container->get('library.discovery');
}
/**
* Tests that the jQuery.form library is deprecated.
*/
public function testJqueryFormDeprecation() {
$this->libraryDiscovery->getLibraryByName('core', 'jquery.form');
$this->expectDeprecation("The core/jquery.form asset library is deprecated in Drupal 9.4.0 and will be removed in Drupal 10.0.0.");
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment