diff --git a/core/misc/dialog.theme.css b/core/assets/css/dialog.theme.css similarity index 100% rename from core/misc/dialog.theme.css rename to core/assets/css/dialog.theme.css diff --git a/core/misc/dropbutton/dropbutton.css b/core/assets/css/dropbutton/dropbutton.css similarity index 100% rename from core/misc/dropbutton/dropbutton.css rename to core/assets/css/dropbutton/dropbutton.css diff --git a/core/misc/dropbutton/dropbutton.theme.css b/core/assets/css/dropbutton/dropbutton.theme.css similarity index 100% rename from core/misc/dropbutton/dropbutton.theme.css rename to core/assets/css/dropbutton/dropbutton.theme.css diff --git a/core/misc/print.css b/core/assets/css/print.css similarity index 100% rename from core/misc/print.css rename to core/assets/css/print.css diff --git a/core/misc/vertical-tabs.css b/core/assets/css/vertical-tabs.css similarity index 100% rename from core/misc/vertical-tabs.css rename to core/assets/css/vertical-tabs.css diff --git a/core/misc/active-link.js b/core/assets/js/active-link.js similarity index 100% rename from core/misc/active-link.js rename to core/assets/js/active-link.js diff --git a/core/misc/ajax.js b/core/assets/js/ajax.js similarity index 100% rename from core/misc/ajax.js rename to core/assets/js/ajax.js diff --git a/core/misc/announce.js b/core/assets/js/announce.js similarity index 100% rename from core/misc/announce.js rename to core/assets/js/announce.js diff --git a/core/misc/autocomplete.js b/core/assets/js/autocomplete.js similarity index 100% rename from core/misc/autocomplete.js rename to core/assets/js/autocomplete.js diff --git a/core/misc/batch.js b/core/assets/js/batch.js similarity index 100% rename from core/misc/batch.js rename to core/assets/js/batch.js diff --git a/core/misc/collapse.js b/core/assets/js/collapse.js similarity index 100% rename from core/misc/collapse.js rename to core/assets/js/collapse.js diff --git a/core/misc/debounce.js b/core/assets/js/debounce.js similarity index 100% rename from core/misc/debounce.js rename to core/assets/js/debounce.js diff --git a/core/misc/dialog/dialog.ajax.js b/core/assets/js/dialog/dialog.ajax.js similarity index 100% rename from core/misc/dialog/dialog.ajax.js rename to core/assets/js/dialog/dialog.ajax.js diff --git a/core/misc/dialog/dialog.jquery-ui.js b/core/assets/js/dialog/dialog.jquery-ui.js similarity index 100% rename from core/misc/dialog/dialog.jquery-ui.js rename to core/assets/js/dialog/dialog.jquery-ui.js diff --git a/core/misc/dialog/dialog.js b/core/assets/js/dialog/dialog.js similarity index 100% rename from core/misc/dialog/dialog.js rename to core/assets/js/dialog/dialog.js diff --git a/core/misc/dialog/dialog.position.js b/core/assets/js/dialog/dialog.position.js similarity index 100% rename from core/misc/dialog/dialog.position.js rename to core/assets/js/dialog/dialog.position.js diff --git a/core/misc/displace.js b/core/assets/js/displace.js similarity index 100% rename from core/misc/displace.js rename to core/assets/js/displace.js diff --git a/core/misc/dropbutton/dropbutton.js b/core/assets/js/dropbutton/dropbutton.js similarity index 100% rename from core/misc/dropbutton/dropbutton.js rename to core/assets/js/dropbutton/dropbutton.js diff --git a/core/misc/drupal.js b/core/assets/js/drupal.js similarity index 100% rename from core/misc/drupal.js rename to core/assets/js/drupal.js diff --git a/core/misc/form.js b/core/assets/js/form.js similarity index 100% rename from core/misc/form.js rename to core/assets/js/form.js diff --git a/core/misc/jquery.intrinsic.js b/core/assets/js/jquery.intrinsic.js similarity index 100% rename from core/misc/jquery.intrinsic.js rename to core/assets/js/jquery.intrinsic.js diff --git a/core/misc/machine-name.js b/core/assets/js/machine-name.js similarity index 100% rename from core/misc/machine-name.js rename to core/assets/js/machine-name.js diff --git a/core/misc/progress.js b/core/assets/js/progress.js similarity index 100% rename from core/misc/progress.js rename to core/assets/js/progress.js diff --git a/core/misc/states.js b/core/assets/js/states.js similarity index 100% rename from core/misc/states.js rename to core/assets/js/states.js diff --git a/core/misc/tabbingmanager.js b/core/assets/js/tabbingmanager.js similarity index 100% rename from core/misc/tabbingmanager.js rename to core/assets/js/tabbingmanager.js diff --git a/core/misc/tabledrag.js b/core/assets/js/tabledrag.js similarity index 100% rename from core/misc/tabledrag.js rename to core/assets/js/tabledrag.js diff --git a/core/misc/tableheader.js b/core/assets/js/tableheader.js similarity index 100% rename from core/misc/tableheader.js rename to core/assets/js/tableheader.js diff --git a/core/misc/tableresponsive.js b/core/assets/js/tableresponsive.js similarity index 100% rename from core/misc/tableresponsive.js rename to core/assets/js/tableresponsive.js diff --git a/core/misc/tableselect.js b/core/assets/js/tableselect.js similarity index 100% rename from core/misc/tableselect.js rename to core/assets/js/tableselect.js diff --git a/core/misc/timezone.js b/core/assets/js/timezone.js similarity index 100% rename from core/misc/timezone.js rename to core/assets/js/timezone.js diff --git a/core/misc/vertical-tabs.js b/core/assets/js/vertical-tabs.js similarity index 100% rename from core/misc/vertical-tabs.js rename to core/assets/js/vertical-tabs.js diff --git a/core/core.libraries.yml b/core/core.libraries.yml index c8ab09e..a45c807 100644 --- a/core/core.libraries.yml +++ b/core/core.libraries.yml @@ -45,7 +45,7 @@ domready: drupal: version: VERSION js: - misc/drupal.js: { weight: -18 } + assets/js/drupal.js: { weight: -18 } dependencies: - core/domready - core/drupalSettings @@ -67,7 +67,7 @@ drupalSettings: drupal.active-link: version: VERSION js: - misc/active-link.js: {} + assets/js/active-link.js: {} dependencies: - core/drupal - core/drupalSettings @@ -76,7 +76,7 @@ drupal.active-link: drupal.ajax: version: VERSION js: - misc/ajax.js: {} + assets/js/ajax.js: {} drupalSettings: # These placeholder values will be set by system_js_settings_alter(). ajaxPageState: @@ -93,7 +93,7 @@ drupal.ajax: drupal.announce: version: VERSION js: - misc/announce.js: {} + assets/js/announce.js: {} dependencies: - core/drupal - core/drupal.debounce @@ -101,7 +101,7 @@ drupal.announce: drupal.autocomplete: version: VERSION js: - misc/autocomplete.js: { weight: -1 } + assets/js/autocomplete.js: { weight: -1 } dependencies: - core/jquery - core/drupal @@ -112,7 +112,7 @@ drupal.autocomplete: drupal.batch: version: VERSION js: - misc/batch.js: { cache: false } + assets/js/batch.js: { cache: false } dependencies: - core/jquery - core/drupal @@ -124,7 +124,7 @@ drupal.batch: drupal.collapse: version: VERSION js: - misc/collapse.js: {} + assets/js/collapse.js: {} dependencies: - core/jquery - core/modernizr @@ -135,7 +135,7 @@ drupal.collapse: drupal.debounce: version: VERSION js: - misc/debounce.js: {} + assets/js/debounce.js: {} dependencies: # @todo Remove Drupal dependency. - core/drupal @@ -143,12 +143,12 @@ drupal.debounce: drupal.dialog: version: VERSION js: - misc/dialog/dialog.js: {} - misc/dialog/dialog.position.js: {} - misc/dialog/dialog.jquery-ui.js: {} + assets/js/dialog/dialog.js: {} + assets/js/dialog/dialog.position.js: {} + assets/js/dialog/dialog.jquery-ui.js: {} css: theme: - misc/dialog.theme.css: {} + assets/css/dialog.theme.css: {} dependencies: - core/jquery - core/drupal @@ -160,7 +160,7 @@ drupal.dialog: drupal.dialog.ajax: version: VERSION js: - misc/dialog/dialog.ajax.js: {} + assets/js/dialog/dialog.ajax.js: {} dependencies: - core/jquery - core/drupal @@ -171,7 +171,7 @@ drupal.dialog.ajax: drupal.displace: version: VERSION js: - misc/displace.js: {} + assets/js/displace.js: {} dependencies: - core/jquery - core/drupal @@ -180,12 +180,12 @@ drupal.displace: drupal.dropbutton: version: VERSION js: - misc/dropbutton/dropbutton.js: {} + assets/js/dropbutton/dropbutton.js: {} css: component: - misc/dropbutton/dropbutton.css: {} + assets/css/dropbutton/dropbutton.css: {} theme: - misc/dropbutton/dropbutton.theme.css: {} + assets/css/dropbutton/dropbutton.theme.css: {} dependencies: - core/jquery - core/drupal @@ -195,7 +195,7 @@ drupal.dropbutton: drupal.form: version: VERSION js: - misc/form.js: {} + assets/js/form.js: {} dependencies: - core/jquery - core/drupal @@ -206,7 +206,7 @@ drupal.form: drupal.machine-name: version: VERSION js: - misc/machine-name.js: {} + assets/js/machine-name.js: {} dependencies: - core/jquery - core/jquery.once @@ -216,7 +216,7 @@ drupal.machine-name: drupal.progress: version: VERSION js: - misc/progress.js: {} + assets/js/progress.js: {} dependencies: - core/drupal - core/jquery @@ -225,7 +225,7 @@ drupal.progress: drupal.states: version: VERSION js: - misc/states.js: {} + assets/js/states.js: {} dependencies: - core/jquery - core/drupal @@ -235,7 +235,7 @@ drupal.states: drupal.tabbingmanager: version: VERSION js: - misc/tabbingmanager.js: {} + assets/js/tabbingmanager.js: {} dependencies: - core/jquery # Supplies the ':tabbable' pseudo selector. @@ -245,7 +245,7 @@ drupal.tabbingmanager: drupal.tabledrag: version: VERSION js: - misc/tabledrag.js: { weight: -1 } + assets/js/tabledrag.js: { weight: -1 } dependencies: - core/jquery - core/modernizr @@ -257,7 +257,7 @@ drupal.tabledrag: drupal.tableheader: version: VERSION js: - misc/tableheader.js: {} + assets/js/tableheader.js: {} dependencies: - core/jquery - core/drupal @@ -268,7 +268,7 @@ drupal.tableheader: drupal.tableresponsive: version: VERSION js: - misc/tableresponsive.js: {} + assets/js/tableresponsive.js: {} dependencies: - core/jquery - core/drupal @@ -277,7 +277,7 @@ drupal.tableresponsive: drupal.tableselect: version: VERSION js: - misc/tableselect.js: {} + assets/js/tableselect.js: {} dependencies: - core/drupal - core/jquery @@ -286,7 +286,7 @@ drupal.tableselect: drupal.timezone: version: VERSION js: - misc/timezone.js: {} + assets/js/timezone.js: {} dependencies: - core/jquery - core/jquery.once @@ -296,10 +296,10 @@ drupal.vertical-tabs: version: VERSION js: # Load before core/drupal.collapse. - misc/vertical-tabs.js: { weight: -1 } + assets/js/vertical-tabs.js: { weight: -1 } css: component: - misc/vertical-tabs.css: {} + assets/css/vertical-tabs.css: {} dependencies: - core/jquery - core/jquery.once @@ -372,7 +372,7 @@ jquery.form: jquery.intrinsic: version: VERSION js: - misc/jquery.intrinsic.js: {} + assets/js/jquery.intrinsic.js: {} dependencies: - core/jquery diff --git a/core/lib/Drupal/Core/Ajax/AddCssCommand.php b/core/lib/Drupal/Core/Ajax/AddCssCommand.php index ccd6312..d0a8a41 100644 --- a/core/lib/Drupal/Core/Ajax/AddCssCommand.php +++ b/core/lib/Drupal/Core/Ajax/AddCssCommand.php @@ -13,9 +13,9 @@ * An AJAX command for adding css to the page via ajax. * * This command is implemented by Drupal.AjaxCommands.prototype.add_css() - * defined in misc/ajax.js. + * defined in assets/js/ajax.js. * - * @see misc/ajax.js + * @see assets/js/ajax.js * * @ingroup ajax */ diff --git a/core/lib/Drupal/Core/Ajax/AfterCommand.php b/core/lib/Drupal/Core/Ajax/AfterCommand.php index 9522783..a31c987 100644 --- a/core/lib/Drupal/Core/Ajax/AfterCommand.php +++ b/core/lib/Drupal/Core/Ajax/AfterCommand.php @@ -17,7 +17,7 @@ * given selector. * * This command is implemented by Drupal.AjaxCommands.prototype.insert() - * defined in misc/ajax.js. + * defined in assets/js/ajax.js. * * @see http://docs.jquery.com/Manipulation/after#content * diff --git a/core/lib/Drupal/Core/Ajax/AppendCommand.php b/core/lib/Drupal/Core/Ajax/AppendCommand.php index bf56362..bc1340c 100644 --- a/core/lib/Drupal/Core/Ajax/AppendCommand.php +++ b/core/lib/Drupal/Core/Ajax/AppendCommand.php @@ -17,7 +17,7 @@ * by the given selector. * * This command is implemented by Drupal.AjaxCommands.prototype.insert() - * defined in misc/ajax.js. + * defined in assets/js/ajax.js. * * @see http://docs.jquery.com/Manipulation/append#content * diff --git a/core/lib/Drupal/Core/Ajax/BeforeCommand.php b/core/lib/Drupal/Core/Ajax/BeforeCommand.php index 8a97a88..a63b25e 100644 --- a/core/lib/Drupal/Core/Ajax/BeforeCommand.php +++ b/core/lib/Drupal/Core/Ajax/BeforeCommand.php @@ -17,7 +17,7 @@ * the given selector. * * This command is implemented by Drupal.AjaxCommands.prototype.insert() - * defined in misc/ajax.js. + * defined in assets/js/ajax.js. * * @see http://docs.jquery.com/Manipulation/before#content * diff --git a/core/lib/Drupal/Core/Ajax/ChangedCommand.php b/core/lib/Drupal/Core/Ajax/ChangedCommand.php index 2832d58..11491da 100644 --- a/core/lib/Drupal/Core/Ajax/ChangedCommand.php +++ b/core/lib/Drupal/Core/Ajax/ChangedCommand.php @@ -16,7 +16,7 @@ * given selector as 'ajax-changed'. * * This command is implemented by Drupal.AjaxCommands.prototype.changed() - * defined in misc/ajax.js. + * defined in assets/js/ajax.js. * * @ingroup ajax */ diff --git a/core/lib/Drupal/Core/Ajax/CssCommand.php b/core/lib/Drupal/Core/Ajax/CssCommand.php index 470d583..d960190 100644 --- a/core/lib/Drupal/Core/Ajax/CssCommand.php +++ b/core/lib/Drupal/Core/Ajax/CssCommand.php @@ -16,7 +16,7 @@ * apply the CSS arguments to elements matched by the given selector. * * This command is implemented by Drupal.AjaxCommands.prototype.css() defined - * in misc/ajax.js. + * in assets/js/ajax.js. * * @see http://docs.jquery.com/CSS/css#properties * diff --git a/core/lib/Drupal/Core/Ajax/DataCommand.php b/core/lib/Drupal/Core/Ajax/DataCommand.php index 5b40e30..d04bb3c 100644 --- a/core/lib/Drupal/Core/Ajax/DataCommand.php +++ b/core/lib/Drupal/Core/Ajax/DataCommand.php @@ -16,7 +16,7 @@ * selector via jQuery's data cache. * * This command is implemented by Drupal.AjaxCommands.prototype.data() defined - * in misc/ajax.js. + * in assets/js/ajax.js. * * @ingroup ajax */ diff --git a/core/lib/Drupal/Core/Ajax/HtmlCommand.php b/core/lib/Drupal/Core/Ajax/HtmlCommand.php index 82de657..13125c6 100644 --- a/core/lib/Drupal/Core/Ajax/HtmlCommand.php +++ b/core/lib/Drupal/Core/Ajax/HtmlCommand.php @@ -17,7 +17,7 @@ * leaving the outer tags intact. * * This command is implemented by Drupal.AjaxCommands.prototype.insert() - * defined in misc/ajax.js. + * defined in assets/js/ajax.js. * * @see http://docs.jquery.com/Attributes/html#val * diff --git a/core/lib/Drupal/Core/Ajax/InsertCommand.php b/core/lib/Drupal/Core/Ajax/InsertCommand.php index a0b10db..a143e86 100644 --- a/core/lib/Drupal/Core/Ajax/InsertCommand.php +++ b/core/lib/Drupal/Core/Ajax/InsertCommand.php @@ -17,7 +17,7 @@ * variable of the element that triggered the request. * * This command is implemented by Drupal.AjaxCommands.prototype.insert() - * defined in misc/ajax.js. + * defined in assets/js/ajax.js. * * @ingroup ajax */ diff --git a/core/lib/Drupal/Core/Ajax/InvokeCommand.php b/core/lib/Drupal/Core/Ajax/InvokeCommand.php index 4aa1ea1..1da7e34 100644 --- a/core/lib/Drupal/Core/Ajax/InvokeCommand.php +++ b/core/lib/Drupal/Core/Ajax/InvokeCommand.php @@ -18,7 +18,7 @@ * removeClass(), toggleClass(), etc. * * This command is implemented by Drupal.AjaxCommands.prototype.invoke() - * defined in misc/ajax.js. + * defined in assets/js/ajax.js. * * @ingroup ajax */ diff --git a/core/lib/Drupal/Core/Ajax/PrependCommand.php b/core/lib/Drupal/Core/Ajax/PrependCommand.php index 6409a6a..34551a2 100644 --- a/core/lib/Drupal/Core/Ajax/PrependCommand.php +++ b/core/lib/Drupal/Core/Ajax/PrependCommand.php @@ -17,7 +17,7 @@ * by the given selector. * * This command is implemented by Drupal.AjaxCommands.prototype.insert() - * defined in misc/ajax.js. + * defined in assets/js/ajax.js. * * @see http://docs.jquery.com/Manipulation/prepend#content * diff --git a/core/lib/Drupal/Core/Ajax/RemoveCommand.php b/core/lib/Drupal/Core/Ajax/RemoveCommand.php index f0e5aab..def44f8 100644 --- a/core/lib/Drupal/Core/Ajax/RemoveCommand.php +++ b/core/lib/Drupal/Core/Ajax/RemoveCommand.php @@ -17,7 +17,7 @@ * within them. * * This command is implemented by Drupal.AjaxCommands.prototype.remove() - * defined in misc/ajax.js. + * defined in assets/js/ajax.js. * * @see http://docs.jquery.com/Manipulation/remove#expr * diff --git a/core/lib/Drupal/Core/Ajax/ReplaceCommand.php b/core/lib/Drupal/Core/Ajax/ReplaceCommand.php index 91514a3..4a71d88 100644 --- a/core/lib/Drupal/Core/Ajax/ReplaceCommand.php +++ b/core/lib/Drupal/Core/Ajax/ReplaceCommand.php @@ -17,7 +17,7 @@ * selector with the given HTML. * * This command is implemented by Drupal.AjaxCommands.prototype.insert() - * defined in misc/ajax.js. + * defined in assets/js/ajax.js. * * See * @link http://docs.jquery.com/Manipulation/replaceWith#content jQuery replaceWith command @endlink diff --git a/core/lib/Drupal/Core/Ajax/RestripeCommand.php b/core/lib/Drupal/Core/Ajax/RestripeCommand.php index 708344c..ffb59b9 100644 --- a/core/lib/Drupal/Core/Ajax/RestripeCommand.php +++ b/core/lib/Drupal/Core/Ajax/RestripeCommand.php @@ -16,7 +16,7 @@ * usually used after a table has been modified by a replace or append command. * * This command is implemented by Drupal.AjaxCommands.prototype.restripe() - * defined in misc/ajax.js. + * defined in assets/js/ajax.js. * * @ingroup ajax */ diff --git a/core/lib/Drupal/Core/Ajax/SettingsCommand.php b/core/lib/Drupal/Core/Ajax/SettingsCommand.php index a5a8dc8..c574756 100644 --- a/core/lib/Drupal/Core/Ajax/SettingsCommand.php +++ b/core/lib/Drupal/Core/Ajax/SettingsCommand.php @@ -17,7 +17,7 @@ * given array, depending on the value of the $merge parameter. * * This command is implemented by Drupal.AjaxCommands.prototype.settings() - * defined in misc/ajax.js. + * defined in assets/js/ajax.js. * * @ingroup ajax */ diff --git a/core/lib/Drupal/Core/Ajax/UpdateBuildIdCommand.php b/core/lib/Drupal/Core/Ajax/UpdateBuildIdCommand.php index 2ce74db..bb6af78 100644 --- a/core/lib/Drupal/Core/Ajax/UpdateBuildIdCommand.php +++ b/core/lib/Drupal/Core/Ajax/UpdateBuildIdCommand.php @@ -18,7 +18,7 @@ * forms. * * This command is implemented by - * Drupal.AjaxCommands.prototype.update_build_id() defined in misc/ajax.js. + * Drupal.AjaxCommands.prototype.update_build_id() defined in assets/js/ajax.js. *O * @ingroup ajax */ diff --git a/core/modules/book/templates/book-export-html.html.twig b/core/modules/book/templates/book-export-html.html.twig index 5fb2e97..e7e258b 100644 --- a/core/modules/book/templates/book-export-html.html.twig +++ b/core/modules/book/templates/book-export-html.html.twig @@ -24,7 +24,7 @@ {{ title }} {{ page.head }} - + {# diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module index 42a6772..9fffd0f 100644 --- a/core/modules/locale/locale.module +++ b/core/modules/locale/locale.module @@ -498,7 +498,7 @@ function locale_js_alter(&$javascript, AttachedAssetsInterface $assets) { $js_translation_asset['data'] = $translation_file; // @todo Remove this when https://www.drupal.org/node/1945262 lands. // Decrease the weight so that the translation file is loaded first. - $js_translation_asset['weight'] = $javascript['core/misc/drupal.js']['weight'] - 0.001; + $js_translation_asset['weight'] = $javascript['core/assets/js/drupal.js']['weight'] - 0.001; } else { // If no translation file exists, then remove the placeholder JS asset. diff --git a/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php b/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php index e8b9412..842427b 100644 --- a/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php +++ b/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php @@ -144,7 +144,7 @@ public function testLocaleTranslationJsDependencies() { $js_filename = $prefix . '_' . $js_translation_files[$prefix] . '.js'; // Assert translations JS is included before drupal.js. - $this->assertTrue(strpos($this->content, $js_filename) < strpos($this->content, 'core/misc/drupal.js'), 'Translations are included before Drupal.t.'); + $this->assertTrue(strpos($this->content, $js_filename) < strpos($this->content, 'core/assets/js/drupal.js'), 'Translations are included before Drupal.t.'); } } diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module index 513d46d..a6a6de6 100644 --- a/core/modules/simpletest/simpletest.module +++ b/core/modules/simpletest/simpletest.module @@ -55,8 +55,8 @@ function simpletest_js_alter(&$javascript, AttachedAssetsInterface $assets) { // Since SimpleTest is a special use case for the table select, stick the // SimpleTest JavaScript above the table select. $simpletest = drupal_get_path('module', 'simpletest') . '/simpletest.js'; - if (array_key_exists($simpletest, $javascript) && array_key_exists('core/misc/tableselect.js', $javascript)) { - $javascript[$simpletest]['weight'] = $javascript['core/misc/tableselect.js']['weight'] - 1; + if (array_key_exists($simpletest, $javascript) && array_key_exists('core/assets/js/tableselect.js', $javascript)) { + $javascript[$simpletest]['weight'] = $javascript['core/assets/js/tableselect.js']['weight'] - 1; } } diff --git a/core/modules/system/language.api.php b/core/modules/system/language.api.php index d0ab879..f09579d 100644 --- a/core/modules/system/language.api.php +++ b/core/modules/system/language.api.php @@ -58,7 +58,7 @@ * - For Twig templates, use 't' or 'trans' filters to indicate translatable * text. See https://www.drupal.org/node/2133321 for more information. * - In JavaScript code, use the Drupal.t() and Drupal.formatPlural() functions - * (defined in core/misc/drupal.js) to translate UI text. + * (defined in core/assets/js/drupal.js) to translate UI text. * - If you are using a custom module, theme, etc. that is not hosted on * Drupal.org, see * @link interface_translation_properties Interface translation properties topic @endlink diff --git a/core/modules/system/src/Tests/Common/AttachedAssetsTest.php b/core/modules/system/src/Tests/Common/AttachedAssetsTest.php index a52db9b..e96e9f5 100644 --- a/core/modules/system/src/Tests/Common/AttachedAssetsTest.php +++ b/core/modules/system/src/Tests/Common/AttachedAssetsTest.php @@ -241,7 +241,7 @@ function testHeaderHTML() { $rendered_js = $this->renderer->render($js_render_array); $query_string = $this->container->get('state')->get('system.css_js_query_string') ?: '0'; $this->assertNotIdentical(strpos($rendered_js, ''), FALSE, 'The JS asset in common_test/js-header appears in the header.'); - $this->assertNotIdentical(strpos($rendered_js, '