core/core.libraries.yml | 4 ---- core/lib/Drupal/Core/Asset/AssetResolver.php | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/core/core.libraries.yml b/core/core.libraries.yml index acc5873..d1f3ff2 100644 --- a/core/core.libraries.yml +++ b/core/core.libraries.yml @@ -43,8 +43,6 @@ domready: assets/vendor/domready/ready.min.js: { weight: -21, minified: true } drupal: - # Block the page from being loaded until the 'js' class is added to . - header: true version: VERSION js: misc/drupal.js: { weight: -18 } @@ -181,8 +179,6 @@ drupal.displace: - core/drupal.debounce drupal.dropbutton: - # Block the page from being loaded until dropbuttons are initialized. - header: true version: VERSION js: misc/dropbutton/dropbutton.js: {} diff --git a/core/lib/Drupal/Core/Asset/AssetResolver.php b/core/lib/Drupal/Core/Asset/AssetResolver.php index 85809fa..4c845b3 100644 --- a/core/lib/Drupal/Core/Asset/AssetResolver.php +++ b/core/lib/Drupal/Core/Asset/AssetResolver.php @@ -221,7 +221,7 @@ public function getJsAssets(AttachedAssetsInterface $assets, $optimize) { foreach ($libraries_to_load as $library) { list($extension, $name) = explode('/', $library, 2); $definition = $this->libraryDiscovery->getLibraryByName($extension, $name); - if (isset($definition['js']) && isset($definition['header']) && $definition['header']) { + if (isset($definition['js']) && !empty($definition['header'])) { $header_js_libraries[] = $library; } } @@ -247,8 +247,8 @@ public function getJsAssets(AttachedAssetsInterface $assets, $optimize) { 'browsers' => array(), ); - // 'scope' is a calculated option, based on which libraries are - // marked as 'blocking' (see above). + // 'scope' is a calculated option, based on which libraries are marked + // to be loaded from the header (see above). $options['scope'] = in_array($library, $header_js_libraries) ? 'header' : 'footer'; // Preprocess can only be set if caching is enabled and no attributes