From 2fc40e8642c95abff47e86e8fd921d1984ccaf49 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Tue, 19 Apr 2022 14:15:33 +0100
Subject: [PATCH] Issue #3256549 by cilefen, murilohp, longwave, catch, Spokje:
Remove core/drupal.date asset library
---
core/core.libraries.yml | 9 --
core/lib/Drupal/Core/Render/Element/Date.php | 28 ----
core/misc/date.es6.js | 154 -------------------
core/misc/date.js | 85 ----------
4 files changed, 276 deletions(-)
delete mode 100644 core/misc/date.es6.js
delete mode 100644 core/misc/date.js
diff --git a/core/core.libraries.yml b/core/core.libraries.yml
index dddcda00123b..4815b51479b0 100644
--- a/core/core.libraries.yml
+++ b/core/core.libraries.yml
@@ -485,15 +485,6 @@ drupal.customevent:
js:
misc/polyfills/customevent.js: { weight: -20 }
-drupal.date:
- version: VERSION
- js:
- misc/date.js: {}
- dependencies:
- - core/drupal
- - core/modernizr
- - core/once
-
drupal.debounce:
version: VERSION
js:
diff --git a/core/lib/Drupal/Core/Render/Element/Date.php b/core/lib/Drupal/Core/Render/Element/Date.php
index 887f5d390577..5967f78c43e2 100644
--- a/core/lib/Drupal/Core/Render/Element/Date.php
+++ b/core/lib/Drupal/Core/Render/Element/Date.php
@@ -2,7 +2,6 @@
namespace Drupal\Core\Render\Element;
-use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Render\Element;
/**
@@ -34,7 +33,6 @@ public function getInfo() {
'#theme' => 'input__date',
'#process' => [
[$class, 'processAjaxForm'],
- [$class, 'processDate'],
],
'#pre_render' => [[$class, 'preRenderDate']],
'#theme_wrappers' => ['form_element'],
@@ -43,32 +41,6 @@ public function getInfo() {
];
}
- /**
- * Processes a date form element.
- *
- * @param array $element
- * The form element to process. Properties used:
- * - #attributes: An associative array containing:
- * - type: The type of date field rendered.
- * - #date_date_format: The date format used in PHP formats.
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- * The current state of the form.
- * @param array $complete_form
- * The complete form structure.
- *
- * @return array
- * The processed element.
- */
- public static function processDate(&$element, FormStateInterface $form_state, &$complete_form) {
- // Attach JS support for the date field, if we can determine which date
- // format should be used.
- if ($element['#attributes']['type'] == 'date' && !empty($element['#date_date_format'])) {
- $element['#attached']['library'][] = 'core/drupal.date';
- $element['#attributes']['data-drupal-date-format'] = [$element['#date_date_format']];
- }
- return $element;
- }
-
/**
* Adds form-specific attributes to a 'date' #type element.
*
diff --git a/core/misc/date.es6.js b/core/misc/date.es6.js
deleted file mode 100644
index 42f720ee1a67..000000000000
--- a/core/misc/date.es6.js
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * @file
- * Polyfill for HTML5 date input.
- */
-
-(function (Modernizr, Drupal, once) {
- /**
- * Attach datepicker fallback on date elements.
- *
- * @type {Drupal~behavior}
- *
- * @prop {Drupal~behaviorAttach} attach
- * Attaches the behavior. Adds a class that hides formatting instructions
- * on date/time fields when the browser supports a native datepicker.
- */
- Drupal.behaviors.date = {
- attach(context, settings) {
- // If the browser does not support a native datepicker, add date
- // formatting instructions on date/time fields.
- if (Modernizr.inputtypes.date === false) {
- once('datepicker', '[data-drupal-field-elements="date-time"]').forEach(
- (dateTime) => {
- const dateInput = dateTime.querySelector('input[type="date"]');
- const timeInput = dateTime.querySelector('input[type="time"]');
- const help = Drupal.theme.dateTimeHelp({
- dateId: `${dateInput.id}--description`,
- dateDesc: dateInput.dataset.help,
- timeId: `${timeInput.id}--description`,
- timeDesc: timeInput.dataset.help,
- });
-
- [dateInput, timeInput].forEach((input) => {
- input.setAttribute(
- 'aria-describedby',
- `${input.id}--description`,
- );
- // If the browser does not support date or time inputs, the input
- // is treated as the type "text". The type attribute should be
- // changed to reflect this.
- input.setAttribute('type', 'text');
- });
-
- Drupal.DatepickerPolyfill.attachDescription(dateTime, help);
- },
- );
-
- once('datepicker', '[data-drupal-field-elements="date"]').forEach(
- (date) => {
- const dateInput = date.querySelector('input[type="date"]');
- const help = Drupal.theme.dateHelp({
- dateDesc: dateInput.dataset.help,
- });
-
- // Date-only input will be described by description directly.
- const id = `${date.id}--description`;
- dateInput.setAttribute('aria-describedby', id);
-
- // If the browser does not support date inputs, the input is treated
- // as the type "text". The type attribute should be changed to
- // changed to reflect this.
- dateInput.setAttribute('type', 'text');
- Drupal.DatepickerPolyfill.attachDescription(date, help, id);
- },
- );
- }
- },
- };
-
- /**
- * Provides overridable utility functions for the datepicker polyfill.
- */
- Drupal.DatepickerPolyfill = class {
- /**
- * Adds help text to polyfilled date/time elements.
- *
- * The help text is added to existing description elements when present.
- * If a description element is not present, one is created.
- *
- * @param {HTMLElement} element
- * The input element.
- * @param {string} help
- * The help text.
- * @param {string} id
- * The input id.
- */
- static attachDescription(element, help, id) {
- let description = element.nextElementSibling;
-
- // If no description element exists, create one.
- if (
- !(
- description &&
- description.getAttribute('data-drupal-field-elements') ===
- 'description'
- )
- ) {
- description = Drupal.DatepickerPolyfill.descriptionWrapperElement(id);
- element.parentNode.insertBefore(description, element.nextSibling);
- }
- description.insertAdjacentHTML('beforeend', help);
- }
-
- /**
- * Creates a description wrapper element.
- *
- * @param {string} id
- * The id of the input being described.
- *
- * @return {HTMLElement}
- * The description wrapper DOM element.
- */
- static descriptionWrapperElement(id) {
- const description = document.createElement('div');
- description.classList.add('description');
- description.setAttribute('data-drupal-field-elements', 'description');
- if (id) {
- description.setAttribute('id', id);
- }
- return description;
- }
- };
-
- /**
- * Theme function for no-native-datepicker date input help text.
- *
- * @param {string} dateDesc
- * The help text.
- *
- * @return {string}
- * The HTML markup for the help text.
- */
- Drupal.theme.dateHelp = ({ dateDesc }) =>
- `<div class="no-native-datepicker-help">${dateDesc}</div>`;
-
- /**
- * Theme function for no-native-datepicker date+time inputs help text.
- *
- * @param {string} dateId
- * The date input aria-describedby value.
- * @param {string} timeId
- * The time input aria-describedby value.
- * @param {string} dateDesc
- * The date help text.
- * @param {string} timeDesc
- * The time help text.
- *
- * @return {string}
- * The HTML markup for the help text.
- */
- Drupal.theme.dateTimeHelp = ({ dateId, timeId, dateDesc, timeDesc }) =>
- `<div class="no-native-datepicker-help">
- <span id="${dateId}">${dateDesc}</span> <span id="${timeId}">${timeDesc}</span>
- </div>`;
-})(Modernizr, Drupal, once);
diff --git a/core/misc/date.js b/core/misc/date.js
deleted file mode 100644
index f32f5d006a52..000000000000
--- a/core/misc/date.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
-* DO NOT EDIT THIS FILE.
-* See the following change record for more information,
-* https://www.drupal.org/node/2815083
-* @preserve
-**/
-
-(function (Modernizr, Drupal, once) {
- Drupal.behaviors.date = {
- attach(context, settings) {
- if (Modernizr.inputtypes.date === false) {
- once('datepicker', '[data-drupal-field-elements="date-time"]').forEach(dateTime => {
- const dateInput = dateTime.querySelector('input[type="date"]');
- const timeInput = dateTime.querySelector('input[type="time"]');
- const help = Drupal.theme.dateTimeHelp({
- dateId: `${dateInput.id}--description`,
- dateDesc: dateInput.dataset.help,
- timeId: `${timeInput.id}--description`,
- timeDesc: timeInput.dataset.help
- });
- [dateInput, timeInput].forEach(input => {
- input.setAttribute('aria-describedby', `${input.id}--description`);
- input.setAttribute('type', 'text');
- });
- Drupal.DatepickerPolyfill.attachDescription(dateTime, help);
- });
- once('datepicker', '[data-drupal-field-elements="date"]').forEach(date => {
- const dateInput = date.querySelector('input[type="date"]');
- const help = Drupal.theme.dateHelp({
- dateDesc: dateInput.dataset.help
- });
- const id = `${date.id}--description`;
- dateInput.setAttribute('aria-describedby', id);
- dateInput.setAttribute('type', 'text');
- Drupal.DatepickerPolyfill.attachDescription(date, help, id);
- });
- }
- }
-
- };
- Drupal.DatepickerPolyfill = class {
- static attachDescription(element, help, id) {
- let description = element.nextElementSibling;
-
- if (!(description && description.getAttribute('data-drupal-field-elements') === 'description')) {
- description = Drupal.DatepickerPolyfill.descriptionWrapperElement(id);
- element.parentNode.insertBefore(description, element.nextSibling);
- }
-
- description.insertAdjacentHTML('beforeend', help);
- }
-
- static descriptionWrapperElement(id) {
- const description = document.createElement('div');
- description.classList.add('description');
- description.setAttribute('data-drupal-field-elements', 'description');
-
- if (id) {
- description.setAttribute('id', id);
- }
-
- return description;
- }
-
- };
-
- Drupal.theme.dateHelp = _ref => {
- let {
- dateDesc
- } = _ref;
- return `<div class="no-native-datepicker-help">${dateDesc}</div>`;
- };
-
- Drupal.theme.dateTimeHelp = _ref2 => {
- let {
- dateId,
- timeId,
- dateDesc,
- timeDesc
- } = _ref2;
- return `<div class="no-native-datepicker-help">
- <span id="${dateId}">${dateDesc}</span> <span id="${timeId}">${timeDesc}</span>
- </div>`;
- };
-})(Modernizr, Drupal, once);
\ No newline at end of file
--
GitLab