From dd3a59762dccd7c269f14b9cb979ceffc5e5160c Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Wed, 21 Jan 2015 15:21:06 +0000
Subject: [PATCH] Issue #2368797 by Wim Leers, dawehner, rteijeiro: Optimize
ajaxPageState to keep Drupal 8 sites fast on high-latency networks, prevent
CSS/JS aggregation from taking down sites and use HTTP GET for AJAX requests
---
core/core.libraries.yml | 6 +
core/core.services.yml | 6 +
core/includes/common.inc | 746 +-----------------
core/includes/theme.inc | 23 +-
core/lib/Drupal/Core/Ajax/AjaxResponse.php | 110 +--
.../Drupal/Core/Ajax/OpenDialogCommand.php | 17 -
core/lib/Drupal/Core/Asset/AssetResolver.php | 347 ++++++++
.../Core/Asset/AssetResolverInterface.php | 85 ++
core/lib/Drupal/Core/Asset/AttachedAssets.php | 98 +++
.../Core/Asset/AttachedAssetsInterface.php | 85 ++
.../Core/Asset/CssCollectionGrouper.php | 2 +-
.../Core/Asset/CssCollectionRenderer.php | 43 +
.../Drupal/Core/Asset/JsCollectionGrouper.php | 2 +-
.../Core/Asset/JsCollectionRenderer.php | 13 +-
.../Core/Asset/LibraryDependencyResolver.php | 100 +++
.../LibraryDependencyResolverInterface.php | 51 ++
.../Drupal/Core/Render/Element/Scripts.php | 67 --
.../lib/Drupal/Core/Render/Element/Styles.php | 98 ---
.../Core/Render/MainContent/AjaxRenderer.php | 5 +-
.../Render/MainContent/DialogRenderer.php | 6 +-
.../Core/Render/MainContent/ModalRenderer.php | 6 +-
core/misc/ajax.js | 15 +-
.../src/Tests/CKEditorLoadingTest.php | 12 +-
.../comment/src/Tests/CommentCSSTest.php | 4 +-
core/modules/editor/editor.api.php | 4 +-
.../editor/src/Form/EditorImageDialog.php | 1 +
.../editor/src/Form/EditorLinkDialog.php | 1 +
.../editor/src/Tests/EditorLoadingTest.php | 2 +-
.../Controller/FileWidgetAjaxController.php | 6 +-
.../modules/history/src/Tests/HistoryTest.php | 4 +-
core/modules/locale/locale.module | 5 +-
.../src/Tests/LocaleLibraryAlterTest.php | 10 +-
.../src/Tests/MenuLinkContentUITest.php | 4 +-
.../node/src/Tests/NodeTranslationUITest.php | 4 +-
.../quickedit/src/QuickEditController.php | 16 +-
.../src/Tests/QuickEditLoadingTest.php | 13 +-
core/modules/simpletest/simpletest.module | 3 +-
core/modules/simpletest/src/WebTestBase.php | 7 +-
.../system/src/Tests/Ajax/DialogTest.php | 24 +-
.../system/src/Tests/Ajax/FrameworkTest.php | 93 ++-
.../src/Tests/Common/AttachedAssetsTest.php | 180 +++--
.../system/src/Tests/Theme/TableTest.php | 8 +-
core/modules/system/system.module | 36 +-
.../ajax_forms_test/ajax_forms_test.module | 12 +-
.../src/Form/AjaxFormsTestLazyLoadForm.php | 15 -
.../tests/modules/ajax_test/ajax_test.module | 43 -
.../src/Controller/AjaxTestController.php | 31 +-
.../ajax_test/src/Form/AjaxTestDialogForm.php | 6 +
.../modules/common_test/common_test.module | 4 +-
core/modules/system/theme.api.php | 22 +-
core/modules/user/user.module | 3 +-
.../src/Controller/ViewAjaxController.php | 40 +-
core/modules/views/src/Tests/ViewAjaxTest.php | 3 +-
.../Controller/ViewAjaxControllerTest.php | 23 +-
.../views_ui/src/Form/Ajax/ViewsFormBase.php | 14 +-
core/modules/views_ui/src/Tests/RowUITest.php | 16 +-
.../Asset/LibraryDependencyResolverTest.php | 177 +++++
.../Core/Controller/AjaxRendererTest.php | 1 +
58 files changed, 1479 insertions(+), 1299 deletions(-)
create mode 100644 core/lib/Drupal/Core/Asset/AssetResolver.php
create mode 100644 core/lib/Drupal/Core/Asset/AssetResolverInterface.php
create mode 100644 core/lib/Drupal/Core/Asset/AttachedAssets.php
create mode 100644 core/lib/Drupal/Core/Asset/AttachedAssetsInterface.php
create mode 100644 core/lib/Drupal/Core/Asset/LibraryDependencyResolver.php
create mode 100644 core/lib/Drupal/Core/Asset/LibraryDependencyResolverInterface.php
delete mode 100644 core/lib/Drupal/Core/Render/Element/Scripts.php
delete mode 100644 core/lib/Drupal/Core/Render/Element/Styles.php
create mode 100644 core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php
diff --git a/core/core.libraries.yml b/core/core.libraries.yml
index 1a362025bffc..ffa007346377 100644
--- a/core/core.libraries.yml
+++ b/core/core.libraries.yml
@@ -77,6 +77,12 @@ drupal.ajax:
version: VERSION
js:
misc/ajax.js: {}
+ drupalSettings:
+ # These placeholder values will be set by system_js_settings_alter().
+ ajaxPageState:
+ libraries: null
+ theme: null
+ theme_token: null
dependencies:
- core/jquery
- core/drupal
diff --git a/core/core.services.yml b/core/core.services.yml
index 73c78733e582..ee5c7f047d95 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -1115,6 +1115,12 @@ services:
library.discovery.parser:
class: Drupal\Core\Asset\LibraryDiscoveryParser
arguments: ['@app.root', '@module_handler']
+ library.dependency_resolver:
+ class: Drupal\Core\Asset\LibraryDependencyResolver
+ arguments: ['@library.discovery']
+ asset.resolver:
+ class: Drupal\Core\Asset\AssetResolver
+ arguments: ['@library.discovery', '@library.dependency_resolver', '@module_handler', '@theme.manager']
info_parser:
class: Drupal\Core\Extension\InfoParser
twig:
diff --git a/core/includes/common.inc b/core/includes/common.inc
index 1c915e9158f4..27c9c540d0b5 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -759,305 +759,6 @@ function _drupal_add_html_head_link($attributes, $header = FALSE) {
_drupal_add_html_head($element, 'html_head_link:' . $attributes['rel'] . ':' . $href);
}
-/**
- * Adds a cascading stylesheet to the stylesheet queue.
- *
- * Calling drupal_static_reset('_drupal_add_css') will clear all cascading
- * stylesheets added so far.
- *
- * If CSS aggregation/compression is enabled, all cascading style sheets added
- * with $options['preprocess'] set to TRUE will be merged into one aggregate
- * file and compressed by removing all extraneous white space.
- * Externally hosted stylesheets are never aggregated or compressed.
- *
- * The reason for aggregating the files is outlined quite thoroughly here:
- * http://www.die.net/musings/page_load_time/ "Load fewer external objects. Due
- * to request overhead, one bigger file just loads faster than two smaller ones
- * half its size."
- *
- * $options['preprocess'] should be only set to TRUE when a file is required for
- * all typical visitors and most pages of a site. It is critical that all
- * preprocessed files are added unconditionally on every page, even if the
- * files do not happen to be needed on a page.
- *
- * Non-preprocessed files should only be added to the page when they are
- * actually needed.
- *
- * @param $data
- * (optional) The stylesheet data to be added, depending on what is passed
- * through to the $options['type'] parameter:
- * - 'file': The path to the CSS file relative to the base_path(), or a
- * stream wrapper URI. For example: "modules/devel/devel.css" or
- * "public://generated_css/stylesheet_1.css". Note that Modules should
- * always prefix the names of their CSS files with the module name; for
- * example, system-menus.css rather than simply menus.css. Themes can
- * override module-supplied CSS files based on their filenames, and this
- * prefixing helps prevent confusing name collisions for theme developers.
- * See drupal_get_css() where the overrides are performed.
- * - 'external': The absolute path to an external CSS file that is not hosted
- * on the local server. These files will not be aggregated if CSS
- * aggregation is enabled.
- * @param $options
- * (optional) A string defining the 'type' of CSS that is being added in the
- * $data parameter ('file' or 'external'), or an array which can have any or
- * all of the following keys:
- * - 'type': The type of stylesheet being added. Available options are 'file'
- * or 'external'. Defaults to 'file'.
- * - 'basename': Force a basename for the file being added. Modules are
- * expected to use stylesheets with unique filenames, but integration of
- * external libraries may make this impossible. The basename of
- * 'core/modules/node/node.css' is 'node.css'. If the external library
- * "node.js" ships with a 'node.css', then a different, unique basename
- * would be 'node.js.css'.
- * - 'group': A number identifying the aggregation group in which to add the
- * stylesheet. Available constants are:
- * - CSS_AGGREGATE_DEFAULT: (default) Any module-layer CSS.
- * - CSS_AGGREGATE_THEME: Any theme-layer CSS.
- * The aggregate group number affects load order and the CSS cascade.
- * Stylesheets in an aggregate with a lower group number will be output to
- * the page before stylesheets in an aggregate with a higher group number,
- * so CSS within higher aggregate groups can take precedence over CSS
- * within lower aggregate groups.
- * - 'every_page': For optimal front-end performance when aggregation is
- * enabled, this should be set to TRUE if the stylesheet is present on every
- * page of the website for users for whom it is present at all. This
- * defaults to FALSE. It is set to TRUE for stylesheets added via module and
- * theme .info.yml files. Modules that add stylesheets within
- * hook_page_attachments() implementations, or from other code that ensures
- * that the stylesheet is added to all website pages, should also set this flag
- * to TRUE. All stylesheets within the same group that have the 'every_page'
- * flag set to TRUE and do not have 'preprocess' set to FALSE are aggregated
- * together into a single aggregate file, and that aggregate file can be
- * reused across a user's entire site visit, leading to faster navigation
- * between pages.
- * However, stylesheets that are only needed on pages less frequently
- * visited, can be added by code that only runs for those particular pages,
- * and that code should not set the 'every_page' flag. This minimizes the
- * size of the aggregate file that the user needs to download when first
- * visiting the website. Stylesheets without the 'every_page' flag are
- * aggregated into a separate aggregate file. This other aggregate file is
- * likely to change from page to page, and each new aggregate file needs to
- * be downloaded when first encountered, so it should be kept relatively
- * small by ensuring that most commonly needed stylesheets are added to
- * every page.
- * - 'weight': The weight of the stylesheet specifies the order in which the
- * CSS will appear relative to other stylesheets with the same aggregate
- * group and 'every_page' flag. The exact ordering of stylesheets is as
- * follows:
- * - First by aggregate group.
- * - Then by the 'every_page' flag, with TRUE coming before FALSE.
- * - Then by weight.
- * - Then by the order in which the CSS was added. For example, all else
- * being the same, a stylesheet added by a call to _drupal_add_css() that
- * happened later in the page request gets added to the page after one for
- * which _drupal_add_css() happened earlier in the page request.
- * Available constants are:
- * - CSS_BASE: Styles for HTML elements ("base" styles).
- * - CSS_LAYOUT: Styles that layout a page.
- * - CSS_COMPONENT: Styles for design components (and their associated
- * states and themes.)
- * - CSS_STATE: Styles for states that are not included with components.
- * - CSS_THEME: Styles for themes that are not included with components.
- * The weight numbers follow the SMACSS convention of CSS categorization.
- * See http://drupal.org/node/1887922
- * - 'media': The media type for the stylesheet, e.g., all, print, screen.
- * Defaults to 'all'. It is extremely important to leave this set to 'all'
- * or it will negatively impact front-end performance. Instead add a @media
- * block to the included CSS file.
- * - 'preprocess': If TRUE and CSS aggregation/compression is enabled, the
- * styles will be aggregated and compressed. Defaults to TRUE.
- * - 'browsers': An array containing information specifying which browsers
- * should load the CSS item. See
- * \Drupal\Core\Render\Element\HtmlTag::preRenderConditionalComments() for
- * details.
- *
- * @return
- * An array of queued cascading stylesheets.
- *
- * @deprecated as of Drupal 8.0. Use the #attached key in render arrays instead.
- *
- * @see drupal_get_css()
- */
-function _drupal_add_css($data = NULL, $options = NULL) {
- $css = &drupal_static(__FUNCTION__, array());
-
- // Construct the options, taking the defaults into consideration.
- if (isset($options)) {
- if (!is_array($options)) {
- $options = array('type' => $options);
- }
- }
- else {
- $options = array();
- }
-
- // Create an array of CSS files for each media type first, since each type needs to be served
- // to the browser differently.
- if (isset($data)) {
- $options += array(
- 'type' => 'file',
- 'group' => CSS_AGGREGATE_DEFAULT,
- 'weight' => 0,
- 'every_page' => FALSE,
- 'media' => 'all',
- 'preprocess' => TRUE,
- 'data' => $data,
- 'browsers' => array(),
- );
- $options['browsers'] += array(
- 'IE' => TRUE,
- '!IE' => TRUE,
- );
-
- // Files with a query string cannot be preprocessed.
- if ($options['type'] === 'file' && $options['preprocess'] && strpos($options['data'], '?') !== FALSE) {
- $options['preprocess'] = FALSE;
- }
-
- // Always add a tiny value to the weight, to conserve the insertion order.
- $options['weight'] += count($css) / 1000;
-
- // Add the data to the CSS array depending on the type.
- switch ($options['type']) {
- case 'file':
- // Local CSS files are keyed by basename; if a file with the same
- // basename is added more than once, it gets overridden.
- // By default, take over the filename as basename.
- if (!isset($options['basename'])) {
- $options['basename'] = drupal_basename($data);
- }
- $css[$options['basename']] = $options;
- break;
-
- default:
- // External files are keyed by their full URI, so the same CSS file is
- // not added twice.
- $css[$data] = $options;
- }
- }
-
- return $css;
-}
-
-/**
- * Returns a themed representation of all stylesheets to attach to the page.
- *
- * It loads the CSS in order, with 'module' first, then 'theme' afterwards.
- * This ensures proper cascading of styles so themes can easily override
- * module styles through CSS selectors.
- *
- * Themes may replace module-defined CSS files by adding a stylesheet with the
- * same filename. For example, themes/bartik/system-menus.css would replace
- * modules/system/system-menus.css. This allows themes to override complete
- * CSS files, rather than specific selectors, when necessary.
- *
- * @param $css
- * (optional) An array of CSS files. If no array is provided, the default
- * stylesheets array is used instead.
- * @param $skip_alter
- * (optional) If set to TRUE, this function skips calling
- * \Drupal::moduleHandler->alter() on $css, useful when the calling function
- * passes a $css array that has already been altered.
- *
- * @return
- * A string of XHTML CSS tags.
- *
- * @see _drupal_add_css()
- */
-function drupal_get_css($css = NULL, $skip_alter = FALSE, $theme_add_css = TRUE) {
- $theme_info = \Drupal::theme()->getActiveTheme();
-
- if (!isset($css)) {
- $css = _drupal_add_css();
- }
-
- // Allow modules and themes to alter the CSS items.
- if (!$skip_alter) {
- \Drupal::moduleHandler()->alter('css', $css);
- \Drupal::theme()->alter('css', $css);
- }
-
- // Sort CSS items, so that they appear in the correct order.
- uasort($css, 'drupal_sort_css_js');
-
- // Allow themes to remove CSS files by basename.
- if ($stylesheet_remove = $theme_info->getStyleSheetsRemove()) {
- foreach ($css as $key => $options) {
- if (isset($options['basename']) && isset($stylesheet_remove[$options['basename']])) {
- unset($css[$key]);
- }
- }
- }
- // Allow themes to conditionally override CSS files by basename.
- if ($stylesheet_override = $theme_info->getStyleSheetsOverride()) {
- foreach ($css as $key => $options) {
- if (isset($options['basename']) && isset($stylesheet_override[$options['basename']])) {
- $css[$key]['data'] = $stylesheet_override[$options['basename']];
- }
- }
- }
-
- // Render the HTML needed to load the CSS.
- $styles = array(
- '#type' => 'styles',
- '#items' => $css,
- );
-
- return drupal_render($styles);
-}
-
-/**
- * Sorts CSS and JavaScript resources.
- *
- * Callback for uasort() within:
- * - drupal_get_css()
- * - drupal_get_js()
- *
- * This sort order helps optimize front-end performance while providing modules
- * and themes with the necessary control for ordering the CSS and JavaScript
- * appearing on a page.
- *
- * @param $a
- * First item for comparison. The compared items should be associative arrays
- * of member items from _drupal_add_css() or _drupal_add_js().
- * @param $b
- * Second item for comparison.
- *
- * @see _drupal_add_css()
- * @see _drupal_add_js()
- */
-function drupal_sort_css_js($a, $b) {
- // First order by group, so that all items in the CSS_AGGREGATE_DEFAULT group
- // appear before items in the CSS_AGGREGATE_THEME group. Modules may create
- // additional groups by defining their own constants.
- if ($a['group'] < $b['group']) {
- return -1;
- }
- elseif ($a['group'] > $b['group']) {
- return 1;
- }
- // Within a group, order all infrequently needed, page-specific files after
- // common files needed throughout the website. Separating this way allows for
- // the aggregate file generated for all of the common files to be reused
- // across a site visit without being cut by a page using a less common file.
- elseif ($a['every_page'] && !$b['every_page']) {
- return -1;
- }
- elseif (!$a['every_page'] && $b['every_page']) {
- return 1;
- }
- // Finally, order by weight.
- elseif ($a['weight'] < $b['weight']) {
- return -1;
- }
- elseif ($a['weight'] > $b['weight']) {
- return 1;
- }
- else {
- return 0;
- }
-}
-
/**
* Deletes old cached CSS files.
*
@@ -1124,200 +825,12 @@ function drupal_clean_id_identifier($id) {
}
/**
- * Adds a JavaScript file or setting to the page.
- *
- * The behavior of this function depends on the parameters it is called with.
- * Generally, it handles the addition of JavaScript to the page. The following
- * actions can be performed using this function:
- * - Add a file ('file'): Adds a reference to a JavaScript file to the page.
- * - Add external JavaScript ('external'): Allows the inclusion of external
- * JavaScript files that are not hosted on the local server. Note that these
- * external JavaScript references do not get aggregated when preprocessing is
- * on.
- * - Add settings ('setting'): Adds settings to Drupal's global storage of
- * JavaScript settings. Per-page settings are required by some modules to
- * function properly. All settings will be accessible at drupalSettings.
- *
- * Examples:
- * @code
- * _drupal_add_js('core/misc/collapse.js');
- * _drupal_add_js('core/misc/collapse.js', 'file');
- * _drupal_add_js('http://example.com/example.js', 'external');
- * _drupal_add_js(array('myModule' => array('key' => 'value')), 'setting');
- * @endcode
- *
- * Calling drupal_static_reset('_drupal_add_js') will clear all JavaScript added
- * so far.
- *
- * If JavaScript aggregation is enabled, all JavaScript files added with
- * $options['preprocess'] set to TRUE will be merged into one aggregate file.
- * Externally hosted JavaScripts are never aggregated.
- *
- * The reason for aggregating the files is outlined quite thoroughly here:
- * http://www.die.net/musings/page_load_time/ "Load fewer external objects. Due
- * to request overhead, one bigger file just loads faster than two smaller ones
- * half its size."
- *
- * $options['preprocess'] should be only set to TRUE when a file is required for
- * all typical visitors and most pages of a site. It is critical that all
- * preprocessed files are added unconditionally on every page, even if the
- * files are not needed on a page.
- *
- * Non-preprocessed files should only be added to the page when they are
- * actually needed.
+ * Constructs an array of the defaults that are used for JavaScript assets.
*
* @param $data
- * (optional) If given, the value depends on the $options parameter, or
- * $options['type'] if $options is passed as an associative array:
- * - 'file': Path to the file relative to base_path().
- * - 'external': The absolute path to an external JavaScript file that is not
- * hosted on the local server. These files will not be aggregated if
- * JavaScript aggregation is enabled.
- * - 'setting': An associative array with configuration options. The array is
- * merged directly into drupalSettings. All modules should wrap their
- * actual configuration settings in another variable to prevent conflicts in
- * the drupalSettings namespace. Items added with a string key will replace
- * existing settings with that key; items with numeric array keys will be
- * added to the existing settings array.
- * @param $options
- * (optional) A string defining the type of JavaScript that is being added in
- * the $data parameter ('file'/'setting'/'external'), or an associative array.
- * JavaScript settings should always pass the string 'setting' only. Other
- * types can have the following elements in the array:
- * - type: The type of JavaScript that is to be added to the page. Allowed
- * values are 'file', 'external' or 'setting'. Defaults
- * to 'file'.
- * - scope: The location in which you want to place the script. Possible
- * values are 'header' or 'footer'. If your theme implements different
- * regions, you can also use these. Defaults to 'header'.
- * - group: A number identifying the group in which to add the JavaScript.
- * Available constants are:
- * - JS_LIBRARY: Any libraries, settings, or jQuery plugins.
- * - JS_DEFAULT: Any module-layer JavaScript.
- * - JS_THEME: Any theme-layer JavaScript.
- * The group number serves as a weight: JavaScript within a lower weight
- * group is presented on the page before JavaScript within a higher weight
- * group.
- * - every_page: For optimal front-end performance when aggregation is
- * enabled, this should be set to TRUE if the JavaScript is present on every
- * page of the website for users for whom it is present at all. This
- * defaults to FALSE. It is set to TRUE for JavaScript files that are added
- * via module and theme .info.yml files. Modules that add JavaScript within
- * hook_page_attachments() implementations, or from other code that ensures
- * that the JavaScript is added to all website pages, should also set this
- * flag to TRUE. All JavaScript files within the same group and that have the
- * 'every_page' flag set to TRUE and do not have 'preprocess' set to FALSE
- * are aggregated together into a single aggregate file, and that aggregate
- * file can be reused across a user's entire site visit, leading to faster
- * navigation between pages. However, JavaScript that is only needed on
- * pages less frequently visited, can be added by code that only runs for
- * those particular pages, and that code should not set the 'every_page'
- * flag. This minimizes the size of the aggregate file that the user needs
- * to download when first visiting the website. JavaScript without the
- * 'every_page' flag is aggregated into a separate aggregate file. This
- * other aggregate file is likely to change from page to page, and each new
- * aggregate file needs to be downloaded when first encountered, so it
- * should be kept relatively small by ensuring that most commonly needed
- * JavaScript is added to every page.
- * - weight: A number defining the order in which the JavaScript is added to
- * the page relative to other JavaScript with the same 'scope', 'group',
- * and 'every_page' value. In some cases, the order in which the JavaScript
- * is presented on the page is very important. jQuery, for example, must be
- * added to the page before any jQuery code is run, so jquery.js uses the
- * JS_LIBRARY group and a weight of -20, jquery.once.js (a library drupal.js
- * depends on) uses the JS_LIBRARY group and a weight of -19, drupal.js uses
- * the JS_LIBRARY group and a weight of -1, other libraries use the
- * JS_LIBRARY group and a weight of 0 or higher, and all other scripts use
- * one of the other group constants. The exact ordering of JavaScript is as
- * follows:
- * - First by scope, with 'header' first, 'footer' last, and any other
- * scopes provided by a custom theme coming in between, as determined by
- * the theme.
- * - Then by group.
- * - Then by the 'every_page' flag, with TRUE coming before FALSE.
- * - Then by weight.
- * - Then by the order in which the JavaScript was added. For example, all
- * else being the same, JavaScript added by a call to _drupal_add_js() that
- * happened later in the page request gets added to the page after one for
- * which _drupal_add_js() happened earlier in the page request.
- * - cache: If set to FALSE, the JavaScript file is loaded anew on every page
- * call; in other words, it is not cached. Used only when 'type' references
- * a JavaScript file. Defaults to TRUE.
- * - preprocess: If TRUE and JavaScript aggregation is enabled, the script
- * file will be aggregated. Defaults to TRUE.
- * - attributes: An associative array of attributes for the <script> tag. This
- * may be used to add 'defer', 'async', or custom attributes. Note that
- * setting any attributes will disable preprocessing as though the
- * 'preprocess' option was set to FALSE.
- * - browsers: An array containing information specifying which browsers
- * should load the JavaScript item. See
- * \Drupal\Core\Render\Element\HtmlTag::preRenderConditionalComments() for
- * details.
+ * (optional) The default data parameter for the JavaScript asset array.
*
- * @return
- * The current array of JavaScript files, settings, and in-line code,
- * including Drupal defaults, anything previously added with calls to
- * _drupal_add_js(), and this function call's additions.
- *
- * @deprecated as of Drupal 8.0. Use the #attached key in render arrays instead.
- *
- * @see drupal_get_js()
- */
-function _drupal_add_js($data = NULL, $options = NULL) {
- $javascript = &drupal_static(__FUNCTION__, array());
-
- // Construct the options, taking the defaults into consideration.
- if (isset($options)) {
- if (!is_array($options)) {
- $options = array('type' => $options);
- }
- }
- else {
- $options = array();
- }
- $options += drupal_js_defaults($data);
-
- // Preprocess can only be set if caching is enabled and no attributes are set.
- $options['preprocess'] = $options['cache'] && empty($options['attributes']) ? $options['preprocess'] : FALSE;
-
- // Tweak the weight so that files of the same weight are included in the
- // order of the calls to _drupal_add_js().
- $options['weight'] += count($javascript) / 1000;
- if (isset($data)) {
- switch ($options['type']) {
- case 'setting':
- // If the setting array doesn't exist, add defaults values.
- if (!isset($javascript['drupalSettings'])) {
- $javascript['drupalSettings'] = array(
- 'type' => 'setting',
- 'scope' => 'header',
- 'group' => JS_SETTING,
- 'every_page' => TRUE,
- 'weight' => 0,
- 'browsers' => array(),
- 'data' => array(),
- );
- }
- $javascript['drupalSettings']['data'] = NestedArray::mergeDeepArray([$javascript['drupalSettings']['data'], $data], TRUE);
- break;
-
- default: // 'file' and 'external'
- // Local and external files must keep their name as the associative key
- // so the same JavaScript file is not added twice.
- $javascript[$options['data']] = $options;
- }
- }
- return $javascript;
-}
-
-/**
- * Constructs an array of the defaults that are used for JavaScript items.
- *
- * @param $data
- * (optional) The default data parameter for the JavaScript item array.
- *
- * @see drupal_get_js()
- * @see _drupal_add_js()
+ * @see hook_js_alter()
*/
function drupal_js_defaults($data = NULL) {
return array(
@@ -1335,135 +848,6 @@ function drupal_js_defaults($data = NULL) {
);
}
-/**
- * Returns a themed presentation of all JavaScript code for the current page.
- *
- * References to JavaScript files are placed in a certain order: first, all
- * 'core' files, then all 'module' and finally all 'theme' JavaScript files
- * are added to the page. Then, all settings are output. If running update.php,
- * all preprocessing is disabled.
- *
- * Note that hook_js_alter(&$javascript) is called during this function call
- * to allow alterations of the JavaScript during its presentation. Calls to
- * _drupal_add_js() from hook_js_alter() will not be added to the output
- * presentation. The correct way to add JavaScript during hook_js_alter()
- * is to add another element to the $javascript array, deriving from
- * drupal_js_defaults(). See locale_js_alter() for an example of this.
- *
- * @param $scope
- * (optional) The scope for which the JavaScript rules should be returned.
- * Defaults to 'header'.
- * @param $javascript
- * (optional) An array with all JavaScript code. Defaults to the default
- * JavaScript array for the given scope.
- * @param bool $skip_alter
- * (optional) If set to TRUE, this function skips calling
- * \Drupal::moduleHandler->alter() on $javascript, useful when the calling
- * function passes a $javascript array that has already been altered.
- * @param bool $is_ajax
- * (optional) If set to TRUE, this function is called from an Ajax request and
- * adds javascript settings to update ajaxPageState values.
- *
- * @return
- * All JavaScript code segments and includes for the scope as HTML tags.
- *
- * @see _drupal_add_js()
- * @see locale_js_alter()
- * @see drupal_js_defaults()
- */
-function drupal_get_js($scope = 'header', $javascript = NULL, $skip_alter = FALSE, $is_ajax = FALSE, $theme_add_js = TRUE) {
- if (!isset($javascript)) {
- $javascript = _drupal_add_js();
- }
- if (empty($javascript)) {
- return '';
- }
-
- // Allow modules to alter the JavaScript.
- if (!$skip_alter) {
- \Drupal::moduleHandler()->alter('js', $javascript);
- \Drupal::theme()->alter('js', $javascript);
- }
-
- // Filter out elements of the given scope.
- $items = array();
- foreach ($javascript as $key => $item) {
- if ($item['scope'] == $scope) {
- $items[$key] = $item;
- }
- }
-
- if (!empty($items)) {
- // Sort the JavaScript files so that they appear in the correct order.
- uasort($items, 'drupal_sort_css_js');
- // Don't add settings if there is no other JavaScript on the page, unless
- // this is an AJAX request.
- if (!empty($items['drupalSettings']) || $is_ajax) {
- $theme_key = \Drupal::theme()->getActiveTheme()->getName();
- // Provide the page with information about the theme that's used, so that
- // a later AJAX request can be rendered using the same theme.
- // @see \Drupal\Core\Theme\AjaxBasePageNegotiator
- $ajaxPageState['theme'] = $theme_key;
- // Checks that the DB is available before filling theme_token.
- if (!defined('MAINTENANCE_MODE')) {
- $ajaxPageState['theme_token'] = \Drupal::csrfToken()->get($theme_key);
- }
-
- // Provide the page with information about the individual JavaScript files
- // used, information not otherwise available when aggregation is enabled.
- $ajaxPageState['js'] = array_fill_keys(array_keys($javascript), 1);
- unset($ajaxPageState['js']['drupalSettings']);
-
- // Provide the page with information about the individual CSS files used,
- // information not otherwise available when CSS aggregation is enabled.
- // The setting is attached later in this function, but is set here, so
- // that CSS files removed in drupal_process_attached() are still
- // considered "used" and prevented from being added in a later AJAX
- // request.
- // Skip if no files were added to the page otherwise jQuery.extend() will
- // overwrite the drupalSettings.ajaxPageState.css object with an empty
- // array.
- $css = _drupal_add_css();
- if (!empty($css)) {
- // Cast the array to an object to be on the safe side even if not empty.
- $ajaxPageState['css'] = (object) array_fill_keys(array_keys($css), 1);
- }
-
- _drupal_add_js(['ajaxPageState' => $ajaxPageState], 'setting');
-
- // If we're outputting the header scope, then this might be the final time
- // that drupal_get_js() is running, so add the settings to this output as well
- // as to the _drupal_add_js() cache. If $items['drupalSettings'] doesn't
- // exist, it's because drupal_get_js() was intentionally passed a
- // $javascript argument stripped of settings, potentially in order to
- // override how settings get output, so in this case, do not add the
- // setting to this output.
- if ($scope == 'header' && isset($items['drupalSettings'])) {
- $items['drupalSettings']['data']['ajaxPageState'] = $ajaxPageState;
- }
- }
- }
-
- // Process the 'drupalSettings' JavaScript asset, if any.
- if (!empty($items['drupalSettings'])) {
- $settings = $items['drupalSettings']['data'];
-
- // Allow modules and themes to alter the JavaScript settings.
- \Drupal::moduleHandler()->alter('js_settings', $settings);
- \Drupal::theme()->alter('js_settings', $settings);
-
- $items['drupalSettings']['data'] = $settings;
- }
-
- // Render the HTML needed to load the JavaScript.
- $elements = array(
- '#type' => 'scripts',
- '#items' => $items,
- );
-
- return drupal_render($elements);
-}
-
/**
* Merges two #attached arrays.
*
@@ -1517,7 +901,7 @@ function drupal_merge_attached(array $a, array $b) {
}
/**
- * Adds attachments to a render() structure.
+ * Processes non-asset attachments in a render() structure.
*
* Libraries, JavaScript settings, feeds, HTML <head> tags and HTML <head> links
* are attached to elements using the #attached property. The #attached property
@@ -1528,6 +912,9 @@ function drupal_merge_attached(array $a, array $b) {
* $build['#attached'] = [
* 'library' => ['core/jquery']
* ];
+ * $build['#attached']['http_header'] = [
+ * ['Content-Type', 'application/rss+xml; charset=utf-8'],
+ * ];
* @endcode
*
* The available keys are:
@@ -1538,58 +925,25 @@ function drupal_merge_attached(array $a, array $b) {
* - 'html_head_link' (<link> tags in HTML <head>)
* - 'http_header' (HTTP headers)
*
- * For example:
- * @code
- * $build['#attached']['http_header'] = array(
- * array('Content-Type', 'application/rss+xml; charset=utf-8'),
- * );
- * @endcode
+ * This function processes all non-asset attachments, to apply them to the
+ * current response (that means all keys except 'library' and 'drupalSettings').
*
* @param array $elements
* The structured array describing the data being rendered.
- * @param bool $dependency_check
- * When TRUE, will exit if a given library's dependencies are missing. When
- * set to FALSE, will continue to add the libraries, even though one or more
- * dependencies are missing. Defaults to FALSE.
- *
- * @return bool
- * FALSE if there were any missing library dependencies; TRUE if all library
- * dependencies were met.
- *
- * @see _drupal_add_library()
- * @see _drupal_add_js()
- * @see _drupal_add_css()
+ *
* @see drupal_render()
+ * @see \Drupal\Core\Asset\AssetResolver
+ *
+ * @throws LogicException
+ * When attaching something of a non-existing attachment type.
*/
-function drupal_process_attached(array $elements, $dependency_check = FALSE) {
- // Add defaults to the special attached structures that should be processed differently.
- $elements['#attached'] += array(
- 'library' => array(),
- );
-
- // Add the libraries first.
- $success = TRUE;
- foreach ($elements['#attached']['library'] as $library) {
- if (_drupal_add_library($library) === FALSE) {
- $success = FALSE;
- // Exit if the dependency is missing.
- if ($dependency_check) {
- return $success;
- }
- }
- }
- unset($elements['#attached']['library']);
-
- // Convert every JavaScript settings asset into a regular JavaScript asset.
- // @todo Clean this up in https://www.drupal.org/node/2368797
- if (!empty($elements['#attached']['drupalSettings'])) {
- _drupal_add_js($elements['#attached']['drupalSettings'], ['type' => 'setting']);
- unset($elements['#attached']['drupalSettings']);
+function drupal_process_attached(array $elements) {
+ // Asset attachments are handled by \Drupal\Core\Asset\AssetResolver.
+ foreach (array('library', 'drupalSettings') as $type) {
+ unset($elements['#attached'][$type]);
}
// Add additional types of attachments specified in the render() structure.
- // Libraries, JavaScript and CSS have been added already, as they require
- // special handling.
foreach ($elements['#attached'] as $callback => $options) {
foreach ($elements['#attached'][$callback] as $args) {
// Limit the amount allowed entries.
@@ -1617,8 +971,6 @@ function drupal_process_attached(array $elements, $dependency_check = FALSE) {
}
}
}
-
- return $success;
}
/**
@@ -1754,68 +1106,6 @@ function drupal_process_states(&$elements) {
$elements[$key]['data-drupal-states'] = JSON::encode($elements['#states']);
}
-/**
- * Adds multiple JavaScript or CSS files at the same time.
- *
- * A library defines a set of JavaScript and/or CSS files, optionally using
- * settings, and optionally requiring another library. For example, a library
- * can be a jQuery plugin, a JavaScript framework, or a CSS framework. This
- * function allows modules to load a library defined/shipped by itself or a
- * depending module, without having to add all files of the library separately.
- * Each library is only loaded once.
- *
- * @param $library_name
- * The name of the library to add.
- * @param $every_page
- * Set to TRUE if this library is added to every page on the site.
- *
- * @return
- * TRUE if the library was successfully added; FALSE if the library or one of
- * its dependencies could not be added.
- *
- * @see \Drupal\Core\Asset\LibraryDiscovery
- * @see hook_library_info_alter()
- *
- * @deprecated in Drupal 8.0.x, will be removed before Drupal 8.0.0
- * Use #attached on render arrays.
- */
-function _drupal_add_library($library_name, $every_page = NULL) {
- $added = &drupal_static(__FUNCTION__, array());
- /** @var \Drupal\Core\Asset\LibraryDiscoveryInterface $library_discovery */
- $library_discovery = \Drupal::service('library.discovery');
-
- list($extension, $name) = explode('/', $library_name, 2);
- // Only process the library if it exists and it was not added already.
- if (!isset($added[$extension][$name])) {
- if ($library = $library_discovery->getLibraryByName($extension, $name)) {
- // Add all components within the library.
- $elements['#attached'] = array(
- 'library' => $library['dependencies'],
- );
- if (isset($library['drupalSettings'])) {
- $elements['#attached']['drupalSettings'] = $library['drupalSettings'];
- }
- $added[$extension][$name] = drupal_process_attached($elements, TRUE);
-
- // Add both the JavaScript and the CSS.
- // The parameters for _drupal_add_js() and _drupal_add_css() require special
- // handling.
- foreach (array('js', 'css') as $type) {
- foreach ($library[$type] as $options) {
- call_user_func('_drupal_add_' . $type, $options['data'], $options);
- }
- unset($elements['#attached'][$type]);
- }
- }
- else {
- // Requested library does not exist.
- $added[$extension][$name] = FALSE;
- }
- }
-
- return $added[$extension][$name];
-}
-
/**
* Assists in attaching the tableDrag JavaScript behavior to a themed table.
*
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 5f584196b184..2664a3472012 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -15,6 +15,7 @@
use Drupal\Component\Utility\Unicode;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Component\Utility\Xss;
+use Drupal\Core\Asset\AttachedAssets;
use Drupal\Core\Config\Config;
use Drupal\Core\Config\StorageException;
use Drupal\Core\Extension\Extension;
@@ -1400,11 +1401,25 @@ function template_preprocess_html(&$variables) {
// Render the attachments into HTML markup to be used directly in the template
// for #type => html: html.html.twig.
$all_attached = ['#attached' => $attached];
+ $assets = AttachedAssets::createFromRenderArray($all_attached);
+ // Take Ajax page state into account, to allow for something like Turbolinks
+ // to be implemented without altering core.
+ // @see https://github.com/rails/turbolinks/
+ $ajax_page_state = \Drupal::request()->request->get('ajax_page_state');
+ $assets->setAlreadyLoadedLibraries(isset($ajax_page_state) ? explode(',', $ajax_page_state['libraries']) : []);
+ // Optimize CSS/JS if necessary, but only during normal site operation.
+ $optimize_css = !defined('MAINTENANCE_MODE') && \Drupal::config('system.performance')->get('css.preprocess');
+ $optimize_js = !defined('MAINTENANCE_MODE') && \Drupal::config('system.performance')->get('js.preprocess');
+ // Render the asset collections.
+ $asset_resolver = \Drupal::service('asset.resolver');
+ $variables['styles'] = \Drupal::service('asset.css.collection_renderer')->render($asset_resolver->getCssAssets($assets, $optimize_css));
+ list($js_assets_header, $js_assets_footer) = $asset_resolver->getJsAssets($assets, $optimize_js);
+ $js_collection_renderer = \Drupal::service('asset.js.collection_renderer');
+ $variables['scripts'] = $js_collection_renderer->render($js_assets_header);
+ $variables['scripts_bottom'] = $js_collection_renderer->render($js_assets_footer);
+
+ // Handle all non-asset attachments.
drupal_process_attached($all_attached);
-
- $variables['styles'] = drupal_get_css();
- $variables['scripts'] = drupal_get_js();
- $variables['scripts_bottom'] = drupal_get_js('footer');
$variables['head'] = drupal_get_html_head(FALSE);
}
diff --git a/core/lib/Drupal/Core/Ajax/AjaxResponse.php b/core/lib/Drupal/Core/Ajax/AjaxResponse.php
index f69af8329d48..fcb45afbb174 100644
--- a/core/lib/Drupal/Core/Ajax/AjaxResponse.php
+++ b/core/lib/Drupal/Core/Ajax/AjaxResponse.php
@@ -7,6 +7,7 @@
namespace Drupal\Core\Ajax;
+use Drupal\Core\Asset\AttachedAssets;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -25,6 +26,32 @@ class AjaxResponse extends JsonResponse {
*/
protected $commands = array();
+ /**
+ * The attachments for this Ajax response.
+ *
+ * @var array
+ */
+ protected $attachments = [
+ 'library' => [],
+ 'drupalSettings' => [],
+ ];
+
+ /**
+ * Sets attachments for this Ajax response.
+ *
+ * When this Ajax response is rendered, it will take care of generating the
+ * necessary Ajax commands, if any.
+ *
+ * @param array $attachments
+ * An #attached array.
+ *
+ * @return $this
+ */
+ public function setAttachments(array $attachments) {
+ $this->attachments = $attachments;
+ return $this;
+ }
+
/**
* Add an AJAX command to the response.
*
@@ -90,77 +117,54 @@ public function prepareResponse(Request $request) {
* An array of commands ready to be returned as JSON.
*/
protected function ajaxRender(Request $request) {
- // Ajax responses aren't rendered with html.html.twig, so we have to call
- // drupal_get_css() and drupal_get_js() here, in order to have new files
- // added during this request to be loaded by the page. We only want to send
- // back files that the page hasn't already loaded, so we implement simple
- // diffing logic using array_diff_key().
$ajax_page_state = $request->request->get('ajax_page_state');
- foreach (array('css', 'js') as $type) {
- // It is highly suspicious if
- // $request->request->get("ajax_page_state[$type]") is empty, since the
- // base page ought to have at least one JS file and one CSS file loaded.
- // It probably indicates an error, and rather than making the page reload
- // all of the files, instead we return no new files.
- if (empty($ajax_page_state[$type])) {
- $items[$type] = array();
- }
- else {
- $function = '_drupal_add_' . $type;
- $items[$type] = $function();
- \Drupal::moduleHandler()->alter($type, $items[$type]);
- // @todo Inline CSS and JS items are indexed numerically. These can't be
- // reliably diffed with array_diff_key(), since the number can change
- // due to factors unrelated to the inline content, so for now, we
- // strip the inline items from Ajax responses, and can add support for
- // them when _drupal_add_css() and _drupal_add_js() are changed to use
- // a hash of the inline content as the array key.
- foreach ($items[$type] as $key => $item) {
- if (is_numeric($key)) {
- unset($items[$type][$key]);
- }
- }
- // Ensure that the page doesn't reload what it already has.
- $items[$type] = array_diff_key($items[$type], $ajax_page_state[$type]);
- }
- }
+
+ // Aggregate CSS/JS if necessary, but only during normal site operation.
+ $config = \Drupal::config('system.performance');
+ $optimize_css = !defined('MAINTENANCE_MODE') && $config->get('css.preprocess');
+ $optimize_js = !defined('MAINTENANCE_MODE') && $config->get('js.preprocess');
+
+ // Resolve the attached libraries into asset collections.
+ $assets = new AttachedAssets();
+ $assets->setLibraries(isset($this->attachments['library']) ? $this->attachments['library'] : [])
+ ->setAlreadyLoadedLibraries(isset($ajax_page_state) ? explode(',', $ajax_page_state['libraries']) : [])
+ ->setSettings(isset($this->attachments['drupalSettings']) ? $this->attachments['drupalSettings'] : []);
+ $asset_resolver = \Drupal::service('asset.resolver');
+ $css_assets = $asset_resolver->getCssAssets($assets, $optimize_css);
+ list($js_assets_header, $js_assets_footer) = $asset_resolver->getJsAssets($assets, $optimize_js);
// Render the HTML to load these files, and add AJAX commands to insert this
- // HTML in the page. We pass TRUE as the $skip_alter argument to prevent the
- // data from being altered again, as we already altered it above. Settings
- // are handled separately, afterwards.
- if (isset($items['js']['drupalSettings'])) {
- unset($items['js']['drupalSettings']);
- }
- $styles = drupal_get_css($items['css'], TRUE);
- $scripts_footer = drupal_get_js('footer', $items['js'], TRUE, TRUE);
- $scripts_header = drupal_get_js('header', $items['js'], TRUE, TRUE);
+ // HTML in the page. Settings are handled separately, afterwards.
+ $settings = (isset($js_assets_header['drupalSettings'])) ? $js_assets_header['drupalSettings']['data'] : [];
+ unset($js_assets_header['drupalSettings']);
- // Prepend commands to add the resources, preserving their relative order.
+ // Prepend commands to add the assets, preserving their relative order.
$resource_commands = array();
- if (!empty($styles)) {
- $resource_commands[] = new AddCssCommand($styles);
+ $renderer = \Drupal::service('renderer');
+ if (!empty($css_assets)) {
+ $css_render_array = \Drupal::service('asset.css.collection_renderer')->render($css_assets);
+ $resource_commands[] = new AddCssCommand($renderer->render($css_render_array));
}
- if (!empty($scripts_header)) {
- $resource_commands[] = new PrependCommand('head', $scripts_header);
+ if (!empty($js_assets_header)) {
+ $js_header_render_array = \Drupal::service('asset.js.collection_renderer')->render($js_assets_header);
+ $resource_commands[] = new PrependCommand('head', $renderer->render($js_header_render_array));
}
- if (!empty($scripts_footer)) {
- $resource_commands[] = new AppendCommand('body', $scripts_footer);
+ if (!empty($js_assets_footer)) {
+ $js_footer_render_array = \Drupal::service('asset.js.collection_renderer')->render($js_assets_footer);
+ $resource_commands[] = new AppendCommand('body', $renderer->render($js_footer_render_array));
}
foreach (array_reverse($resource_commands) as $resource_command) {
$this->addCommand($resource_command, TRUE);
}
// Prepend a command to merge changes and additions to drupalSettings.
- $scripts = _drupal_add_js();
- if (!empty($scripts['drupalSettings'])) {
- $settings = $scripts['drupalSettings']['data'];
+ if (!empty($settings)) {
// During Ajax requests basic path-specific settings are excluded from
// new drupalSettings values. The original page where this request comes
// from already has the right values. An Ajax request would update them
// with values for the Ajax request and incorrectly override the page's
// values.
- // @see _drupal_add_js()
+ // @see system_js_settings_alter()
unset($settings['path']);
$this->addCommand(new SettingsCommand($settings, TRUE), TRUE);
}
diff --git a/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php b/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php
index 89ae38cf11b1..9ee09cc8c991 100644
--- a/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php
+++ b/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php
@@ -125,9 +125,6 @@ public function setDialogTitle($title) {
* Implements \Drupal\Core\Ajax\CommandInterface:render().
*/
public function render() {
- // Add the library for handling the dialog in the response.
- $this->drupalAttachLibrary('core/drupal.dialog.ajax');
-
// For consistency ensure the modal option is set to TRUE or FALSE.
$this->dialogOptions['modal'] = isset($this->dialogOptions['modal']) && $this->dialogOptions['modal'];
return array(
@@ -139,18 +136,4 @@ public function render() {
);
}
- /**
- * Wraps drupal_render.
- *
- * @param string $name
- * The name of the library.
- *
- * @todo Remove once drupal_render is converted to autoloadable code.
- * @see https://drupal.org/node/2171071
- */
- protected function drupalAttachLibrary($name) {
- $attached['#attached']['library'][] = $name;
- drupal_process_attached($attached);
- }
-
}
diff --git a/core/lib/Drupal/Core/Asset/AssetResolver.php b/core/lib/Drupal/Core/Asset/AssetResolver.php
new file mode 100644
index 000000000000..1b02761907b1
--- /dev/null
+++ b/core/lib/Drupal/Core/Asset/AssetResolver.php
@@ -0,0 +1,347 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Core\Asset\AssetResolver.
+ */
+
+namespace Drupal\Core\Asset;
+
+use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Theme\ThemeManagerInterface;
+
+/**
+ * The default asset resolver.
+ */
+class AssetResolver implements AssetResolverInterface {
+
+ /**
+ * The library discovery service.
+ *
+ * @var \Drupal\Core\Asset\LibraryDiscoveryInterface
+ */
+ protected $libraryDiscovery;
+
+ /**
+ * The library dependency resolver.
+ *
+ * @var \Drupal\Core\Asset\LibraryDependencyResolverInterface
+ */
+ protected $libraryDependencyResolver;
+
+ /**
+ * The module handler.
+ *
+ * @var \Drupal\Core\Extension\ModuleHandlerInterface
+ */
+ protected $moduleHandler;
+
+ /**
+ * The theme manager.
+ *
+ * @var \Drupal\Core\Theme\ThemeManagerInterface
+ */
+ protected $themeManager;
+
+ /**
+ * Constructs a new AssetResolver instance.
+ *
+ * @param \Drupal\Core\Asset\LibraryDiscoveryInterface $library_discovery
+ * The library discovery service.
+ * @param \Drupal\Core\Asset\LibraryDependencyResolverInterface $library_dependency_resolver
+ * The library dependency resolver.
+ * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+ * The module handler.
+ * @param \Drupal\Core\Theme\ThemeManagerInterface $theme_manager
+ * The theme manager.
+ */
+ public function __construct(LibraryDiscoveryInterface $library_discovery, LibraryDependencyResolverInterface $library_dependency_resolver, ModuleHandlerInterface $module_handler, ThemeManagerInterface $theme_manager) {
+ $this->libraryDiscovery = $library_discovery;
+ $this->libraryDependencyResolver = $library_dependency_resolver;
+ $this->moduleHandler = $module_handler;
+ $this->themeManager = $theme_manager;
+ }
+
+ /**
+ * Returns the libraries that need to be loaded.
+ *
+ * For example, with core/a depending on core/c and core/b on core/d:
+ * @code
+ * $assets = new AttachedAssets();
+ * $assets->setLibraries(['core/a', 'core/b', 'core/c']);
+ * $assets->setAlreadyLoadedLibraries(['core/c']);
+ * $resolver->getLibrariesToLoad($assets) === ['core/a', 'core/b', 'core/d']
+ * @endcode
+ *
+ * @param \Drupal\Core\Asset\AttachedAssetsInterface $assets
+ * The assets attached to the current response.
+ *
+ * @return string[]
+ * A list of libraries and their dependencies, in the order they should be
+ * loaded, excluding any libraries that have already been loaded.
+ */
+ protected function getLibrariesToLoad(AttachedAssetsInterface $assets) {
+ return array_diff(
+ $this->libraryDependencyResolver->getLibrariesWithDependencies($assets->getLibraries()),
+ $this->libraryDependencyResolver->getLibrariesWithDependencies($assets->getAlreadyLoadedLibraries())
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getCssAssets(AttachedAssetsInterface $assets, $optimize) {
+ $theme_info = $this->themeManager->getActiveTheme();
+
+ $css = [];
+
+ foreach ($this->getLibrariesToLoad($assets) as $library) {
+ list($extension, $name) = explode('/', $library, 2);
+ $definition = $this->libraryDiscovery->getLibraryByName($extension, $name);
+ if (isset($definition['css'])) {
+ foreach ($definition['css'] as $options) {
+ $options += array(
+ 'type' => 'file',
+ 'group' => CSS_AGGREGATE_DEFAULT,
+ 'weight' => 0,
+ 'every_page' => FALSE,
+ 'media' => 'all',
+ 'preprocess' => TRUE,
+ 'browsers' => array(),
+ );
+ $options['browsers'] += array(
+ 'IE' => TRUE,
+ '!IE' => TRUE,
+ );
+
+ // Files with a query string cannot be preprocessed.
+ if ($options['type'] === 'file' && $options['preprocess'] && strpos($options['data'], '?') !== FALSE) {
+ $options['preprocess'] = FALSE;
+ }
+
+ // Always add a tiny value to the weight, to conserve the insertion
+ // order.
+ $options['weight'] += count($css) / 1000;
+
+ // Add the data to the CSS array depending on the type.
+ switch ($options['type']) {
+ case 'file':
+ // Local CSS files are keyed by basename; if a file with the same
+ // basename is added more than once, it gets overridden.
+ // By default, take over the filename as basename.
+ if (!isset($options['basename'])) {
+ $options['basename'] = drupal_basename($options['data']);
+ }
+ $css[$options['basename']] = $options;
+ break;
+
+ default:
+ // External files are keyed by their full URI, so the same CSS
+ // file is not added twice.
+ $css[$options['data']] = $options;
+ }
+ }
+ }
+ }
+
+ // Allow modules and themes to alter the CSS assets.
+ $this->moduleHandler->alter('css', $css, $assets);
+ $this->themeManager->alter('css', $css, $assets);
+
+ // Sort CSS items, so that they appear in the correct order.
+ uasort($css, 'static::sort');
+
+ // Allow themes to remove CSS files by basename.
+ if ($stylesheet_remove = $theme_info->getStyleSheetsRemove()) {
+ foreach ($css as $key => $options) {
+ if (isset($options['basename']) && isset($stylesheet_remove[$options['basename']])) {
+ unset($css[$key]);
+ }
+ }
+ }
+ // Allow themes to conditionally override CSS files by basename.
+ if ($stylesheet_override = $theme_info->getStyleSheetsOverride()) {
+ foreach ($css as $key => $options) {
+ if (isset($options['basename']) && isset($stylesheet_override[$options['basename']])) {
+ $css[$key]['data'] = $stylesheet_override[$options['basename']];
+ }
+ }
+ }
+
+ if ($optimize) {
+ $css = \Drupal::service('asset.css.collection_optimizer')->optimize($css);
+ }
+
+ return $css;
+ }
+
+ /**
+ * Returns the JavaScript settings assets for this response's libraries.
+ *
+ * Gathers all drupalSettings from all libraries in the attached assets
+ * collection and merges them, then it merges individual attached settings,
+ * and finally invokes hook_js_settings_alter() to allow alterations of
+ * JavaScript settings by modules and themes.
+ *
+ * @param \Drupal\Core\Asset\AttachedAssetsInterface $assets
+ * The assets attached to the current response.
+ * @return array
+ * A (possibly optimized) collection of JavaScript assets.
+ */
+ protected function getJsSettingsAssets(AttachedAssetsInterface $assets) {
+ $settings = [];
+
+ foreach ($this->getLibrariesToLoad($assets) as $library) {
+ list($extension, $name) = explode('/', $library, 2);
+ $definition = $this->libraryDiscovery->getLibraryByName($extension, $name);
+ if (isset($definition['drupalSettings'])) {
+ $settings = NestedArray::mergeDeepArray([$settings, $definition['drupalSettings']], TRUE);
+ }
+ }
+
+ // Attached settings win over settings in libraries.
+ $settings = NestedArray::mergeDeepArray([$settings, $assets->getSettings()], TRUE);
+
+ // Allow modules and themes to alter the JavaScript settings.
+ $this->moduleHandler->alter('js_settings', $settings, $assets);
+ $this->themeManager->alter('js_settings', $settings, $assets);
+
+ return $settings;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getJsAssets(AttachedAssetsInterface $assets, $optimize) {
+ $javascript = [];
+
+ foreach ($this->getLibrariesToLoad($assets) as $library) {
+ list($extension, $name) = explode('/', $library, 2);
+ $definition = $this->libraryDiscovery->getLibraryByName($extension, $name);
+ if (isset($definition['js'])) {
+ foreach ($definition['js'] as $options) {
+ $options += array(
+ 'type' => 'file',
+ 'group' => JS_DEFAULT,
+ 'every_page' => FALSE,
+ 'weight' => 0,
+ 'scope' => 'header',
+ 'cache' => TRUE,
+ 'preprocess' => TRUE,
+ 'attributes' => array(),
+ 'version' => NULL,
+ 'browsers' => array(),
+ );
+
+ // Preprocess can only be set if caching is enabled and no attributes
+ // are set.
+ $options['preprocess'] = $options['cache'] && empty($options['attributes']) ? $options['preprocess'] : FALSE;
+
+ // Always add a tiny value to the weight, to conserve the insertion
+ // order.
+ $options['weight'] += count($javascript) / 1000;
+
+ // Local and external files must keep their name as the associative
+ // key so the same JavaScript file is not added twice.
+ $javascript[$options['data']] = $options;
+ }
+ }
+ }
+
+ // Allow modules and themes to alter the JavaScript assets.
+ $this->moduleHandler->alter('js', $javascript, $assets);
+ $this->themeManager->alter('js', $javascript, $assets);
+
+ // Sort JavaScript assets, so that they appear in the correct order.
+ uasort($javascript, 'static::sort');
+
+ // Prepare the return value: filter JavaScript assets per scope.
+ $js_assets_header = [];
+ $js_assets_footer = [];
+ foreach ($javascript as $key => $item) {
+ if ($item['scope'] == 'header') {
+ $js_assets_header[$key] = $item;
+ }
+ elseif ($item['scope'] == 'footer') {
+ $js_assets_footer[$key] = $item;
+ }
+ }
+
+ // @todo Refactor this when the default scope is changed to 'footer' in
+ // https://www.drupal.org/node/784626
+ // If the core/drupalSettings library is being loaded or is already loaded,
+ // get the JavaScript settings assets, and convert them into a single
+ // "regular" JavaScript asset.
+ $libraries_to_load = $this->getLibrariesToLoad($assets);
+ $settings_needed = in_array('core/drupalSettings', $libraries_to_load) || in_array('core/drupalSettings', $this->libraryDependencyResolver->getLibrariesWithDependencies($assets->getAlreadyLoadedLibraries()));
+ $settings_have_changed = count($libraries_to_load) > 0 || count($assets->getSettings()) > 0;
+ if ($settings_needed && $settings_have_changed) {
+ $settings = $this->getJsSettingsAssets($assets);
+ if (!empty($settings)) {
+ // Prepend to the list of JavaScript assets, to render it first.
+ $settings_as_inline_javascript = [
+ 'type' => 'setting',
+ 'group' => JS_SETTING,
+ 'every_page' => TRUE,
+ 'weight' => 0,
+ 'browsers' => array(),
+ 'data' => $settings,
+ ];
+ $js_assets_header = ['drupalSettings' => $settings_as_inline_javascript] + $js_assets_header;
+ }
+ }
+
+ return [
+ $js_assets_header,
+ $js_assets_footer,
+ ];
+ }
+
+ /**
+ * Sorts CSS and JavaScript resources.
+ *
+ * This sort order helps optimize front-end performance while providing
+ * modules and themes with the necessary control for ordering the CSS and
+ * JavaScript appearing on a page.
+ *
+ * @param $a
+ * First item for comparison. The compared items should be associative
+ * arrays of member items.
+ * @param $b
+ * Second item for comparison.
+ *
+ * @return int
+ */
+ public static function sort($a, $b) {
+ // First order by group, so that all items in the CSS_AGGREGATE_DEFAULT
+ // group appear before items in the CSS_AGGREGATE_THEME group. Modules may
+ // create additional groups by defining their own constants.
+ if ($a['group'] < $b['group']) {
+ return -1;
+ }
+ elseif ($a['group'] > $b['group']) {
+ return 1;
+ }
+ // Within a group, order all infrequently needed, page-specific files after
+ // common files needed throughout the website. Separating this way allows
+ // for the aggregate file generated for all of the common files to be reused
+ // across a site visit without being cut by a page using a less common file.
+ elseif ($a['every_page'] && !$b['every_page']) {
+ return -1;
+ }
+ elseif (!$a['every_page'] && $b['every_page']) {
+ return 1;
+ }
+ // Finally, order by weight.
+ elseif ($a['weight'] < $b['weight']) {
+ return -1;
+ }
+ elseif ($a['weight'] > $b['weight']) {
+ return 1;
+ }
+ else {
+ return 0;
+ }
+ }
+
+}
diff --git a/core/lib/Drupal/Core/Asset/AssetResolverInterface.php b/core/lib/Drupal/Core/Asset/AssetResolverInterface.php
new file mode 100644
index 000000000000..6857c87ffc01
--- /dev/null
+++ b/core/lib/Drupal/Core/Asset/AssetResolverInterface.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Core\Asset\AssetResolverInterface.
+ */
+
+namespace Drupal\Core\Asset;
+
+/**
+ * Resolves asset libraries into concrete CSS and JavaScript assets.
+ *
+ * Given an attached assets collection (to be loaded for the current response),
+ * the asset resolver can resolve those asset libraries into a list of concrete
+ * CSS and JavaScript assets.
+ *
+ * In other words: this allows developers to translate Drupal's asset
+ * abstraction (asset libraries) into concrete assets.
+ *
+ * @see \Drupal\Core\Asset\AttachedAssetsInterface
+ * @see \Drupal\Core\Asset\LibraryDependencyResolverInterface
+ */
+interface AssetResolverInterface {
+
+ /**
+ * Returns the CSS assets for the current response's libraries.
+ *
+ * It returns the CSS assets in order, according to the SMACSS categories
+ * specified in the assets' weights:
+ * 1. CSS_BASE
+ * 2. CSS_LAYOUT
+ * 3. CSS_COMPONENT
+ * 4. CSS_STATE
+ * 5. CSS_THEME
+ * @see https://www.drupal.org/node/1887918#separate-concerns
+ * This ensures proper cascading of styles so themes can easily override
+ * module styles through CSS selectors.
+ *
+ * Themes may replace module-defined CSS files by adding a stylesheet with the
+ * same filename. For example, themes/bartik/system-menus.css would replace
+ * modules/system/system-menus.css. This allows themes to override complete
+ * CSS files, rather than specific selectors, when necessary.
+ *
+ * Also invokes hook_css_alter(), to allow CSS assets to be altered.
+ *
+ * @param \Drupal\Core\Asset\AttachedAssetsInterface $assets
+ * The assets attached to the current response.
+ * @param bool $optimize
+ * Whether to apply the CSS asset collection optimizer, to return an
+ * optimized CSS asset collection rather than an unoptimized one.
+ *
+ * @return array
+ * A (possibly optimized) collection of CSS assets.
+ */
+ public function getCssAssets(AttachedAssetsInterface $assets, $optimize);
+
+ /**
+ * Returns the JavaScript assets for the current response's libraries.
+ *
+ * References to JavaScript files are placed in a certain order: first, all
+ * 'core' files, then all 'module' and finally all 'theme' JavaScript files
+ * are added to the page. Then, all settings are output, followed by 'inline'
+ * JavaScript code. If running update.php, all preprocessing is disabled.
+ *
+ * Note that hook_js_alter(&$javascript) is called during this function call
+ * to allow alterations of the JavaScript during its presentation. The correct
+ * way to add JavaScript during hook_js_alter() is to add another element to
+ * the $javascript array, deriving from drupal_js_defaults(). See
+ * locale_js_alter() for an example of this.
+ *
+ * @param \Drupal\Core\Asset\AttachedAssetsInterface $assets
+ * The assets attached to the current response.
+ * @param bool $optimize
+ * Whether to apply the JavaScript asset collection optimizer, to return
+ * optimized JavaScript asset collections rather than an unoptimized ones.
+ *
+ * @return array
+ * A nested array containing 2 values:
+ * - at index zero: the (possibly optimized) collection of JavaScript assets
+ * for the top of the page
+ * - at index one: the (possibly optimized) collection of JavaScript assets
+ * for the bottom of the page
+ */
+ public function getJsAssets(AttachedAssetsInterface $assets, $optimize);
+
+}
diff --git a/core/lib/Drupal/Core/Asset/AttachedAssets.php b/core/lib/Drupal/Core/Asset/AttachedAssets.php
new file mode 100644
index 000000000000..d94618e9898d
--- /dev/null
+++ b/core/lib/Drupal/Core/Asset/AttachedAssets.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Core\Asset\AttachedAssets.
+ */
+
+namespace Drupal\Core\Asset;
+
+/**
+ * The default attached assets collection.
+ */
+class AttachedAssets implements AttachedAssetsInterface {
+
+ /**
+ * The (ordered) list of asset libraries attached to the current response.
+ *
+ * @var string[]
+ */
+ public $libraries = [];
+
+ /**
+ * The JavaScript settings attached to the current response.
+ *
+ * @var array
+ */
+ public $settings = [];
+
+ /**
+ * The set of asset libraries that the client has already loaded.
+ *
+ * @var string[]
+ */
+ protected $alreadyLoadedLibraries = [];
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function createFromRenderArray(array $render_array) {
+ if (!isset($render_array['#attached'])) {
+ throw new \LogicException('The render array has not yet been rendered, hence not all attachments have been collected yet.');
+ }
+
+ $assets = new static();
+ if (isset($render_array['#attached']['library'])) {
+ $assets->setLibraries($render_array['#attached']['library']);
+ }
+ if (isset($render_array['#attached']['drupalSettings'])) {
+ $assets->setSettings($render_array['#attached']['drupalSettings']);
+ }
+ return $assets;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setLibraries(array $libraries) {
+ $this->libraries = array_unique($libraries);
+ return $this;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getLibraries() {
+ return $this->libraries;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setSettings(array $settings) {
+ $this->settings = $settings;
+ return $this;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getSettings() {
+ return $this->settings;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getAlreadyLoadedLibraries() {
+ return $this->alreadyLoadedLibraries;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setAlreadyLoadedLibraries(array $libraries) {
+ $this->alreadyLoadedLibraries = $libraries;
+ return $this;
+ }
+
+}
diff --git a/core/lib/Drupal/Core/Asset/AttachedAssetsInterface.php b/core/lib/Drupal/Core/Asset/AttachedAssetsInterface.php
new file mode 100644
index 000000000000..956cf6210417
--- /dev/null
+++ b/core/lib/Drupal/Core/Asset/AttachedAssetsInterface.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Core\Asset\AttachedAssetsInterface.
+ */
+
+namespace Drupal\Core\Asset;
+
+/**
+ * The attached assets collection for the current response.
+ *
+ * Allows for storage of:
+ * - an ordered list of asset libraries (to be loaded for the current response)
+ * - attached JavaScript settings (to be loaded for the current response)
+ * - a set of asset libraries that the client already has loaded (as indicated
+ * in the request, to *not* be loaded for the current response)
+ *
+ * @see \Drupal\Core\Asset\AssetResolverInterface
+ */
+interface AttachedAssetsInterface {
+
+ /**
+ * Creates an AttachedAssetsInterface object from a render array.
+ *
+ * @param array $render_array
+ * A render array.
+ *
+ * @return \Drupal\Core\Asset\AttachedAssetsInterface
+ *
+ * @throws \LogicException
+ */
+ public static function createFromRenderArray(array $render_array);
+
+ /**
+ * Sets the asset libraries attached to the current response.
+ *
+ * @param string[] $libraries
+ * A list of libraries, in the order they should be loaded.
+ *
+ * @return $this
+ */
+ public function setLibraries(array $libraries);
+
+ /**
+ * Returns the asset libraries attached to the current response.
+ *
+ * @return string[]
+ */
+ public function getLibraries();
+
+ /**
+ * Sets the JavaScript settings that are attached to the current response.
+ *
+ * @param array $settings
+ * The needed JavaScript settings.
+ *
+ * @return $this
+ */
+ public function setSettings(array $settings);
+
+ /**
+ * Returns the settings attached to the current response.
+ *
+ * @return array
+ */
+ public function getSettings();
+
+ /**
+ * Sets the asset libraries that the current request marked as already loaded.
+ *
+ * @param string[] $libraries
+ * The set of already loaded libraries.
+ *
+ * @return $this
+ */
+ public function setAlreadyLoadedLibraries(array $libraries);
+
+ /**
+ * Returns the set of already loaded asset libraries.
+ *
+ * @return string[]
+ */
+ public function getAlreadyLoadedLibraries();
+
+}
diff --git a/core/lib/Drupal/Core/Asset/CssCollectionGrouper.php b/core/lib/Drupal/Core/Asset/CssCollectionGrouper.php
index a8f4355698a9..2f727e6f3cd0 100644
--- a/core/lib/Drupal/Core/Asset/CssCollectionGrouper.php
+++ b/core/lib/Drupal/Core/Asset/CssCollectionGrouper.php
@@ -58,7 +58,7 @@ public function group(array $css_assets) {
// Group file items if their 'preprocess' flag is TRUE.
// Help ensure maximum reuse of aggregate files by only grouping
// together items that share the same 'group' value and 'every_page'
- // flag. See _drupal_add_css() for details about that.
+ // flag.
$group_keys = $item['preprocess'] ? array($item['type'], $item['group'], $item['every_page'], $item['media'], $item['browsers']) : FALSE;
break;
diff --git a/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php b/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
index d00fcb40f6eb..6d851d5f440d 100644
--- a/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
+++ b/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
@@ -11,6 +11,49 @@
/**
* Renders CSS assets.
+ *
+ * For production websites, LINK tags are preferable to STYLE tags with @import
+ * statements, because:
+ * - They are the standard tag intended for linking to a resource.
+ * - On Firefox 2 and perhaps other browsers, CSS files included with @import
+ * statements don't get saved when saving the complete web page for offline
+ * use: http://drupal.org/node/145218.
+ * - On IE, if only LINK tags and no @import statements are used, all the CSS
+ * files are downloaded in parallel, resulting in faster page load, but if
+ * @import statements are used and span across multiple STYLE tags, all the
+ * ones from one STYLE tag must be downloaded before downloading begins for
+ * the next STYLE tag. Furthermore, IE7 does not support media declaration on
+ * the @import statement, so multiple STYLE tags must be used when different
+ * files are for different media types. Non-IE browsers always download in
+ * parallel, so this is an IE-specific performance quirk:
+ * http://www.stevesouders.com/blog/2009/04/09/dont-use-import/.
+ *
+ * However, IE has an annoying limit of 31 total CSS inclusion tags
+ * (http://drupal.org/node/228818) and LINK tags are limited to one file per
+ * tag, whereas STYLE tags can contain multiple @import statements allowing
+ * multiple files to be loaded per tag. When CSS aggregation is disabled, a
+ * Drupal site can easily have more than 31 CSS files that need to be loaded, so
+ * using LINK tags exclusively would result in a site that would display
+ * incorrectly in IE. Depending on different needs, different strategies can be
+ * employed to decide when to use LINK tags and when to use STYLE tags.
+ *
+ * The strategy employed by this class is to use LINK tags for all aggregate
+ * files and for all files that cannot be aggregated (e.g., if 'preprocess' is
+ * set to FALSE or the type is 'external'), and to use STYLE tags for groups
+ * of files that could be aggregated together but aren't (e.g., if the site-wide
+ * aggregation setting is disabled). This results in all LINK tags when
+ * aggregation is enabled, a guarantee that as many or only slightly more tags
+ * are used with aggregation disabled than enabled (so that if the limit were to
+ * be crossed with aggregation enabled, the site developer would also notice the
+ * problem while aggregation is disabled), and an easy way for a developer to
+ * view HTML source while aggregation is disabled and know what files will be
+ * aggregated together when aggregation becomes enabled.
+ *
+ * This class evaluates the aggregation enabled/disabled condition on a group
+ * by group basis by testing whether an aggregate file has been made for the
+ * group rather than by testing the site-wide aggregation setting. This allows
+ * this class to work correctly even if modules have implemented custom
+ * logic for grouping and aggregating files.
*/
class CssCollectionRenderer implements AssetCollectionRendererInterface {
diff --git a/core/lib/Drupal/Core/Asset/JsCollectionGrouper.php b/core/lib/Drupal/Core/Asset/JsCollectionGrouper.php
index 3547b5120e1e..33d27be23df3 100644
--- a/core/lib/Drupal/Core/Asset/JsCollectionGrouper.php
+++ b/core/lib/Drupal/Core/Asset/JsCollectionGrouper.php
@@ -45,7 +45,7 @@ public function group(array $js_assets) {
// Group file items if their 'preprocess' flag is TRUE.
// Help ensure maximum reuse of aggregate files by only grouping
// together items that share the same 'group' value and 'every_page'
- // flag. See _drupal_add_js() for details about that.
+ // flag.
$group_keys = $item['preprocess'] ? array($item['type'], $item['group'], $item['every_page'], $item['browsers']) : FALSE;
break;
diff --git a/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php b/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php
index 52e6fe1cd197..7db84abe3a86 100644
--- a/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php
+++ b/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php
@@ -22,7 +22,7 @@ class JsCollectionRenderer implements AssetCollectionRendererInterface {
protected $state;
/**
- * Constructs a CssCollectionRenderer.
+ * Constructs a JsCollectionRenderer.
*
* @param \Drupal\Core\State\StateInterface
* The state key/value store.
@@ -33,6 +33,12 @@ public function __construct(StateInterface $state) {
/**
* {@inheritdoc}
+ *
+ * This class evaluates the aggregation enabled/disabled condition on a group
+ * by group basis by testing whether an aggregate file has been made for the
+ * group rather than by testing the site-wide aggregation setting. This allows
+ * this class to work correctly even if modules have implemented custom
+ * logic for grouping and aggregating files.
*/
public function render(array $js_assets) {
$elements = array();
@@ -40,9 +46,8 @@ public function render(array $js_assets) {
// A dummy query-string is added to filenames, to gain control over
// browser-caching. The string changes on every update or full cache
// flush, forcing browsers to load a new copy of the files, as the
- // URL changed. Files that should not be cached (see _drupal_add_js())
- // get REQUEST_TIME as query-string instead, to enforce reload on every
- // page request.
+ // URL changed. Files that should not be cached get REQUEST_TIME as
+ // query-string instead, to enforce reload on every page request.
$default_query_string = $this->state->get('system.css_js_query_string') ?: '0';
// For inline JavaScript to validate as XHTML, all JavaScript containing
diff --git a/core/lib/Drupal/Core/Asset/LibraryDependencyResolver.php b/core/lib/Drupal/Core/Asset/LibraryDependencyResolver.php
new file mode 100644
index 000000000000..34ffc0def8d0
--- /dev/null
+++ b/core/lib/Drupal/Core/Asset/LibraryDependencyResolver.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Asset\LibraryDependencyResolver.
+ */
+
+namespace Drupal\Core\Asset;
+
+/**
+ * Resolves the dependencies of asset (CSS/JavaScript) libraries.
+ */
+class LibraryDependencyResolver implements LibraryDependencyResolverInterface {
+
+ /**
+ * The library discovery service.
+ *
+ * @var \Drupal\Core\Asset\LibraryDiscoveryInterface
+ */
+ protected $libraryDiscovery;
+
+ /**
+ * Constructs a new LibraryDependencyResolver instance.
+ *
+ * @param \Drupal\Core\Asset\LibraryDiscoveryInterface $library_discovery
+ * The library discovery service.
+ */
+ public function __construct(LibraryDiscoveryInterface $library_discovery) {
+ $this->libraryDiscovery = $library_discovery;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getLibrariesWithDependencies(array $libraries) {
+ return $this->doGetDependencies($libraries);
+ }
+
+ /**
+ * Gets the given libraries with its dependencies.
+ *
+ * Helper method for ::getLibrariesWithDependencies().
+ *
+ * @param string[] $libraries_with_unresolved_dependencies
+ * A list of libraries, with unresolved dependencies, in the order they
+ * should be loaded.
+ * @param string[] $final_libraries
+ * The final list of libraries (the return value) that is being built
+ * recursively.
+ *
+ * @return string[]
+ * A list of libraries, in the order they should be loaded, including their
+ * dependencies.
+ */
+ protected function doGetDependencies(array $libraries_with_unresolved_dependencies, array $final_libraries = []) {
+ foreach ($libraries_with_unresolved_dependencies as $library) {
+ if (!in_array($library, $final_libraries)) {
+ list($extension, $name) = explode('/', $library, 2);
+ $definition = $this->libraryDiscovery->getLibraryByName($extension, $name);
+ if (!empty($definition['dependencies'])) {
+ $final_libraries = $this->doGetDependencies($definition['dependencies'], $final_libraries);
+ }
+ $final_libraries[] = $library;
+ }
+ }
+ return $final_libraries;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getMinimalRepresentativeSubset(array $libraries) {
+ $minimal = [];
+
+ // Determine each library's dependencies.
+ $with_deps = [];
+ foreach ($libraries as $library) {
+ $with_deps[$library] = $this->getLibrariesWithDependencies([$library]);
+ }
+
+ foreach ($libraries as $library) {
+ $exists = FALSE;
+ foreach ($with_deps as $other_library => $dependencies) {
+ if ($library == $other_library) {
+ continue;
+ }
+ if (in_array($library, $dependencies)) {
+ $exists = TRUE;
+ break;
+ }
+ }
+ if (!$exists) {
+ $minimal[] = $library;
+ }
+ }
+
+ return $minimal;
+ }
+
+}
diff --git a/core/lib/Drupal/Core/Asset/LibraryDependencyResolverInterface.php b/core/lib/Drupal/Core/Asset/LibraryDependencyResolverInterface.php
new file mode 100644
index 000000000000..66362cc3d8e2
--- /dev/null
+++ b/core/lib/Drupal/Core/Asset/LibraryDependencyResolverInterface.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Asset\LibraryDependencyResolverInterface.
+ */
+
+namespace Drupal\Core\Asset;
+
+/**
+ * Resolves the dependencies of asset (CSS/JavaScript) libraries.
+ */
+interface LibraryDependencyResolverInterface {
+
+ /**
+ * Gets the given libraries with their dependencies.
+ *
+ * Given ['core/a', 'core/b', 'core/c'], with core/a depending on core/c and
+ * core/b on core/d, returns ['core/a', 'core/b', 'core/c', 'core/d'].
+ *
+ * @param string[] $libraries
+ * A list of libraries, in the order they should be loaded.
+ *
+ * @return string[]
+ * A list of libraries, in the order they should be loaded, including their
+ * dependencies.
+ */
+ public function getLibrariesWithDependencies(array $libraries);
+
+ /**
+ * Gets the minimal representative subset of the given libraries.
+ *
+ * A minimal representative subset means that any library in the given set of
+ * libraries that is a dependency of another library in the set, is removed.
+ *
+ * Hence a minimal representative subset is the most compact representation
+ * possible of a set of libraries.
+ *
+ * (Each asset library has dependencies and can therefore be seen as a tree.
+ * Hence the given list of libraries represent a forest. This function returns
+ * all roots of trees that are not a subtree of another tree in the forest.)
+ *
+ * @param string[] $libraries
+ * A set of libraries.
+ *
+ * @return string[]
+ * A representative subset of the given set of libraries.
+ */
+ public function getMinimalRepresentativeSubset(array $libraries);
+
+}
diff --git a/core/lib/Drupal/Core/Render/Element/Scripts.php b/core/lib/Drupal/Core/Render/Element/Scripts.php
deleted file mode 100644
index cc04edec76cb..000000000000
--- a/core/lib/Drupal/Core/Render/Element/Scripts.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Core\Render\Element\Scripts.
- */
-
-namespace Drupal\Core\Render\Element;
-
-/**
- * Provides a render element for adding JavaScript to the HTML output.
- *
- * @see \Drupal\Core\Render\Element\Styles
- *
- * @RenderElement("scripts")
- */
-class Scripts extends RenderElement {
-
- /**
- * {@inheritdoc}
- */
- public function getInfo() {
- $class = get_class($this);
- return array(
- '#items' => array(),
- '#pre_render' => array(
- array($class, 'preRenderScripts'),
- ),
- );
- }
-
- /**
- * #pre_render callback to add the elements needed for JavaScript tags to be rendered.
- *
- * This function evaluates the aggregation enabled/disabled condition on a group
- * by group basis by testing whether an aggregate file has been made for the
- * group rather than by testing the site-wide aggregation setting. This allows
- * this function to work correctly even if modules have implemented custom
- * logic for grouping and aggregating files.
- *
- * @param array $element
- * A render array containing:
- * - #items: The JavaScript items as returned by _drupal_add_js() and
- * altered by drupal_get_js().
- * - #group_callback: A function to call to group #items. Following
- * this function, #aggregate_callback is called to aggregate items within
- * the same group into a single file.
- * - #aggregate_callback: A function to call to aggregate the items within
- * the groups arranged by the #group_callback function.
- *
- * @return array
- * A render array that will render to a string of JavaScript tags.
- *
- * @see drupal_get_js()
- */
- public static function preRenderScripts($element) {
- $js_assets = $element['#items'];
-
- // Aggregate the JavaScript if necessary, but only during normal site
- // operation.
- if (!defined('MAINTENANCE_MODE') && \Drupal::config('system.performance')->get('js.preprocess')) {
- $js_assets = \Drupal::service('asset.js.collection_optimizer')->optimize($js_assets);
- }
- return \Drupal::service('asset.js.collection_renderer')->render($js_assets);
- }
-
-}
diff --git a/core/lib/Drupal/Core/Render/Element/Styles.php b/core/lib/Drupal/Core/Render/Element/Styles.php
deleted file mode 100644
index d285fac2243d..000000000000
--- a/core/lib/Drupal/Core/Render/Element/Styles.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Core\Render\Element\Styles.
- */
-
-namespace Drupal\Core\Render\Element;
-
-/**
- * Provides a render element for adding CSS to the HTML output.
- *
- * @see \Drupal\Core\Render\Element\Scripts
- *
- * @RenderElement("styles")
- */
-class Styles extends RenderElement {
-
- /**
- * {@inheritdoc}
- */
- public function getInfo() {
- $class = get_class($this);
- return array(
- '#items' => array(),
- '#pre_render' => array(
- array($class, 'preRenderStyles'),
- ),
- );
- }
-
- /**
- * Pre-render callback: Adds the elements needed for CSS tags to be rendered.
- *
- * For production websites, LINK tags are preferable to STYLE tags with @import
- * statements, because:
- * - They are the standard tag intended for linking to a resource.
- * - On Firefox 2 and perhaps other browsers, CSS files included with @import
- * statements don't get saved when saving the complete web page for offline
- * use: http://drupal.org/node/145218.
- * - On IE, if only LINK tags and no @import statements are used, all the CSS
- * files are downloaded in parallel, resulting in faster page load, but if
- * @import statements are used and span across multiple STYLE tags, all the
- * ones from one STYLE tag must be downloaded before downloading begins for
- * the next STYLE tag. Furthermore, IE7 does not support media declaration on
- * the @import statement, so multiple STYLE tags must be used when different
- * files are for different media types. Non-IE browsers always download in
- * parallel, so this is an IE-specific performance quirk:
- * http://www.stevesouders.com/blog/2009/04/09/dont-use-import/.
- *
- * However, IE has an annoying limit of 31 total CSS inclusion tags
- * (http://drupal.org/node/228818) and LINK tags are limited to one file per
- * tag, whereas STYLE tags can contain multiple @import statements allowing
- * multiple files to be loaded per tag. When CSS aggregation is disabled, a
- * Drupal site can easily have more than 31 CSS files that need to be loaded, so
- * using LINK tags exclusively would result in a site that would display
- * incorrectly in IE. Depending on different needs, different strategies can be
- * employed to decide when to use LINK tags and when to use STYLE tags.
- *
- * The strategy employed by this function is to use LINK tags for all aggregate
- * files and for all files that cannot be aggregated (e.g., if 'preprocess' is
- * set to FALSE or the type is 'external'), and to use STYLE tags for groups
- * of files that could be aggregated together but aren't (e.g., if the site-wide
- * aggregation setting is disabled). This results in all LINK tags when
- * aggregation is enabled, a guarantee that as many or only slightly more tags
- * are used with aggregation disabled than enabled (so that if the limit were to
- * be crossed with aggregation enabled, the site developer would also notice the
- * problem while aggregation is disabled), and an easy way for a developer to
- * view HTML source while aggregation is disabled and know what files will be
- * aggregated together when aggregation becomes enabled.
- *
- * This function evaluates the aggregation enabled/disabled condition on a group
- * by group basis by testing whether an aggregate file has been made for the
- * group rather than by testing the site-wide aggregation setting. This allows
- * this function to work correctly even if modules have implemented custom
- * logic for grouping and aggregating files.
- *
- * @param array $element
- * A render array containing:
- * - '#items': The CSS items as returned by _drupal_add_css() and altered by
- * drupal_get_css().
- *
- * @return array
- * A render array that will render to a string of XHTML CSS tags.
- *
- * @see drupal_get_css()
- */
- public static function preRenderStyles($element) {
- $css_assets = $element['#items'];
-
- // Aggregate the CSS if necessary, but only during normal site operation.
- if (!defined('MAINTENANCE_MODE') && \Drupal::config('system.performance')->get('css.preprocess')) {
- $css_assets = \Drupal::service('asset.css.collection_optimizer')->optimize($css_assets);
- }
- return \Drupal::service('asset.css.collection_renderer')->render($css_assets);
- }
-
-}
diff --git a/core/lib/Drupal/Core/Render/MainContent/AjaxRenderer.php b/core/lib/Drupal/Core/Render/MainContent/AjaxRenderer.php
index 766dc2dfd96a..6cddc0ceac85 100644
--- a/core/lib/Drupal/Core/Render/MainContent/AjaxRenderer.php
+++ b/core/lib/Drupal/Core/Render/MainContent/AjaxRenderer.php
@@ -65,6 +65,7 @@ public function renderResponse(array $main_content, Request $request, RouteMatch
}
$html = $this->drupalRenderRoot($main_content);
+ $response->setAttachments($main_content['#attached']);
// The selector for the insert command is NULL as the new content will
// replace the element making the Ajax call. The default 'replaceWith'
@@ -84,9 +85,7 @@ public function renderResponse(array $main_content, Request $request, RouteMatch
* @todo: Remove as part of https://drupal.org/node/2182149
*/
protected function drupalRenderRoot(&$elements) {
- $output = drupal_render_root($elements);
- drupal_process_attached($elements);
- return $output;
+ return drupal_render_root($elements);
}
}
diff --git a/core/lib/Drupal/Core/Render/MainContent/DialogRenderer.php b/core/lib/Drupal/Core/Render/MainContent/DialogRenderer.php
index 9f599440ee03..7af9d93df1da 100644
--- a/core/lib/Drupal/Core/Render/MainContent/DialogRenderer.php
+++ b/core/lib/Drupal/Core/Render/MainContent/DialogRenderer.php
@@ -43,7 +43,11 @@ public function renderResponse(array $main_content, Request $request, RouteMatch
// First render the main content, because it might provide a title.
$content = drupal_render_root($main_content);
- drupal_process_attached($main_content);
+
+ // Attach the library necessary for using the OpenDialogCommand and set the
+ // attachments for this Ajax response.
+ $main_content['#attached']['library'][] = 'core/drupal.dialog.ajax';
+ $response->setAttachments($main_content['#attached']);
// Determine the title: use the title provided by the main content if any,
// otherwise get it from the routing information.
diff --git a/core/lib/Drupal/Core/Render/MainContent/ModalRenderer.php b/core/lib/Drupal/Core/Render/MainContent/ModalRenderer.php
index c971eb3ad526..945a76c6778d 100644
--- a/core/lib/Drupal/Core/Render/MainContent/ModalRenderer.php
+++ b/core/lib/Drupal/Core/Render/MainContent/ModalRenderer.php
@@ -26,7 +26,11 @@ public function renderResponse(array $main_content, Request $request, RouteMatch
// First render the main content, because it might provide a title.
$content = drupal_render_root($main_content);
- drupal_process_attached($main_content);
+
+ // Attach the library necessary for using the OpenModalDialogCommand and set
+ // the attachments for this Ajax response.
+ $main_content['#attached']['library'][] = 'core/drupal.dialog.ajax';
+ $response->setAttachments($main_content['#attached']);
// If the main content doesn't provide a title, use the title resolver.
$title = isset($main_content['#title']) ? $main_content['#title'] : $this->titleResolver->getTitle($request, $route_match->getRouteObject());
diff --git a/core/misc/ajax.js b/core/misc/ajax.js
index 40ab702057f9..ac902824a472 100644
--- a/core/misc/ajax.js
+++ b/core/misc/ajax.js
@@ -384,21 +384,12 @@
// Allow Drupal to return new JavaScript and CSS files to load without
// returning the ones already loaded.
// @see \Drupal\Core\Theme\AjaxBasePageNegotiator
- // @see drupal_get_css()
- // @see drupal_get_js()
+ // @see \Drupal\Core\Asset\LibraryDependencyResolverInterface::getMinimalRepresentativeSubset()
+ // @see system_js_settings_alter()
var pageState = drupalSettings.ajaxPageState;
options.data['ajax_page_state[theme]'] = pageState.theme;
options.data['ajax_page_state[theme_token]'] = pageState.theme_token;
- for (var cssFile in pageState.css) {
- if (pageState.css.hasOwnProperty(cssFile)) {
- options.data['ajax_page_state[css][' + cssFile + ']'] = 1;
- }
- }
- for (var jsFile in pageState.js) {
- if (pageState.js.hasOwnProperty(jsFile)) {
- options.data['ajax_page_state[js][' + jsFile + ']'] = 1;
- }
- }
+ options.data['ajax_page_state[libraries]'] = pageState.libraries;
};
/**
diff --git a/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php b/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
index cddf23fa1145..dd53245e11ca 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
+++ b/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
@@ -118,8 +118,7 @@ function testLoading() {
$this->assertTrue(count($format_selector) === 1, 'A single text format selector exists on the page.');
$specific_format_selector = $this->xpath('//select[contains(@class, "filter-list") and contains(@class, "editor") and @data-editor-for="edit-body-0-value"]');
$this->assertTrue(count($specific_format_selector) === 1, 'A single text format selector exists on the page and has the "editor" class and a "data-editor-for" attribute with the correct value.');
- $this->assertTrue(isset($settings['ajaxPageState']['js']['core/modules/ckeditor/js/ckeditor.js']), 'CKEditor glue JS is present.');
- $this->assertTrue(isset($settings['ajaxPageState']['js']['core/assets/vendor/ckeditor/ckeditor.js']), 'CKEditor lib JS is present.');
+ $this->assertTrue(in_array('ckeditor/drupal.ckeditor', explode(',', $settings['ajaxPageState']['libraries'])), 'CKEditor glue library is present.');
// Enable the ckeditor_test module, customize configuration. In this case,
// there is additional CSS and JS to be loaded.
@@ -146,8 +145,7 @@ function testLoading() {
$this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page.");
$this->assertIdentical($expected, $settings['editor'], "Text Editor module's JavaScript settings on the page are correct.");
$this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.');
- $this->assertTrue(isset($settings['ajaxPageState']['js']['core/modules/ckeditor/js/ckeditor.js']), 'CKEditor glue JS is present.');
- $this->assertTrue(isset($settings['ajaxPageState']['js']['core/assets/vendor/ckeditor/ckeditor.js']), 'CKEditor lib JS is present.');
+ $this->assertTrue(in_array('ckeditor/drupal.ckeditor', explode(',', $settings['ajaxPageState']['libraries'])), 'CKEditor glue library is present.');
}
protected function getThingsToCheck() {
@@ -157,8 +155,10 @@ protected function getThingsToCheck() {
$settings,
// Editor.module's JS settings present.
isset($settings['editor']),
- // Editor.module's JS present.
- isset($settings['ajaxPageState']['js']['core/modules/editor/js/editor.js']),
+ // Editor.module's JS present. Note: ckeditor/drupal.ckeditor depends on
+ // editor/drupal.editor, hence presence of the former implies presence of
+ // the latter.
+ isset($settings['ajaxPageState']) && in_array('ckeditor/drupal.ckeditor', explode(',', $settings['ajaxPageState']['libraries'])),
// Body field.
$this->xpath('//textarea[@id="edit-body-0-value"]'),
// Format selector.
diff --git a/core/modules/comment/src/Tests/CommentCSSTest.php b/core/modules/comment/src/Tests/CommentCSSTest.php
index f6205515578c..36033d050e07 100644
--- a/core/modules/comment/src/Tests/CommentCSSTest.php
+++ b/core/modules/comment/src/Tests/CommentCSSTest.php
@@ -110,7 +110,7 @@ function testCommentClasses() {
// user (the viewer) was the author of the comment. We do this in Java-
// Script to prevent breaking the render cache.
$this->assertIdentical(1, count($this->xpath('//*[contains(@class, "comment") and @data-comment-user-id="' . $case['comment_uid'] . '"]')), 'data-comment-user-id attribute is set on comment.');
- $this->assertTrue(isset($settings['ajaxPageState']['js']['core/modules/comment/js/comment-by-viewer.js']), 'drupal.comment-by-viewer library is present.');
+ $this->assertRaw(drupal_get_path('module', 'comment') . '/js/comment-by-viewer.js', 'drupal.comment-by-viewer library is present.');
}
// Verify the unpublished class.
@@ -129,7 +129,7 @@ function testCommentClasses() {
if ($case['comment_status'] == CommentInterface::PUBLISHED || $case['user'] == 'admin') {
$this->assertIdentical(1, count($this->xpath('//*[contains(@class, "comment")]/*[@data-comment-timestamp="' . $comment->getChangedTime() . '"]')), 'data-comment-timestamp attribute is set on comment');
$expectedJS = ($case['user'] !== 'anonymous');
- $this->assertIdentical($expectedJS, isset($settings['ajaxPageState']['js']['core/modules/comment/js/comment-new-indicator.js']), 'drupal.comment-new-indicator library is present.');
+ $this->assertIdentical($expectedJS, isset($settings['ajaxPageState']) && in_array('comment/drupal.comment-new-indicator', explode(',', $settings['ajaxPageState']['libraries'])), 'drupal.comment-new-indicator library is present.');
}
}
}
diff --git a/core/modules/editor/editor.api.php b/core/modules/editor/editor.api.php
index 66c5d2a0c166..2fd9fa41b91f 100644
--- a/core/modules/editor/editor.api.php
+++ b/core/modules/editor/editor.api.php
@@ -30,8 +30,8 @@ function hook_editor_info_alter(array &$editors) {
* Modifies JavaScript settings that are added for text editors.
*
* @param array $settings
- * All the settings that will be added to the page via _drupal_add_js() for
- * the text formats to which a user has access.
+ * All the settings that will be added to the page for the text formats to
+ * which a user has access.
*/
function hook_editor_js_settings_alter(array &$settings) {
if (isset($settings['editor']['formats']['basic_html'])) {
diff --git a/core/modules/editor/src/Form/EditorImageDialog.php b/core/modules/editor/src/Form/EditorImageDialog.php
index a493deab5929..80d63fd1c049 100644
--- a/core/modules/editor/src/Form/EditorImageDialog.php
+++ b/core/modules/editor/src/Form/EditorImageDialog.php
@@ -228,6 +228,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
unset($form['#prefix'], $form['#suffix']);
$status_messages = array('#theme' => 'status_messages');
$output = drupal_render($form);
+ $response->setAttachments($form['#attached']);
$output = '<div>' . drupal_render($status_messages) . $output . '</div>';
$response->addCommand(new HtmlCommand('#editor-image-dialog-form', $output));
}
diff --git a/core/modules/editor/src/Form/EditorLinkDialog.php b/core/modules/editor/src/Form/EditorLinkDialog.php
index 29ce81215962..39ff4fca1712 100644
--- a/core/modules/editor/src/Form/EditorLinkDialog.php
+++ b/core/modules/editor/src/Form/EditorLinkDialog.php
@@ -87,6 +87,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
unset($form['#prefix'], $form['#suffix']);
$status_messages = array('#theme' => 'status_messages');
$output = drupal_render($form);
+ $response->setAttachments($form['#attached']);
$output = '<div>' . drupal_render($status_messages) . $output . '</div>';
$response->addCommand(new HtmlCommand('#editor-link-dialog-form', $output));
}
diff --git a/core/modules/editor/src/Tests/EditorLoadingTest.php b/core/modules/editor/src/Tests/EditorLoadingTest.php
index b619566f2ed1..e693a0ee2912 100644
--- a/core/modules/editor/src/Tests/EditorLoadingTest.php
+++ b/core/modules/editor/src/Tests/EditorLoadingTest.php
@@ -191,7 +191,7 @@ protected function getThingsToCheck() {
// Editor.module's JS settings present.
isset($settings['editor']),
// Editor.module's JS present.
- isset($settings['ajaxPageState']['js']['core/modules/editor/js/editor.js']),
+ strpos($this->getRawContent(), drupal_get_path('module', 'editor') . '/js/editor.js') !== FALSE,
// Body field.
$this->xpath('//textarea[@id="edit-body-0-value"]'),
// Format selector.
diff --git a/core/modules/file/src/Controller/FileWidgetAjaxController.php b/core/modules/file/src/Controller/FileWidgetAjaxController.php
index 3adc43a58d31..e449caf15913 100644
--- a/core/modules/file/src/Controller/FileWidgetAjaxController.php
+++ b/core/modules/file/src/Controller/FileWidgetAjaxController.php
@@ -79,15 +79,13 @@ public function upload(Request $request) {
$status_messages = array('#theme' => 'status_messages');
$form['#prefix'] .= drupal_render($status_messages);
$output = drupal_render($form);
- drupal_process_attached($form);
- $js = _drupal_add_js();
- $settings = $js['drupalSettings']['data'];
$response = new AjaxResponse();
+ $response->setAttachments($form['#attached']);
foreach ($commands as $command) {
$response->addCommand($command, TRUE);
}
- return $response->addCommand(new ReplaceCommand(NULL, $output, $settings));
+ return $response->addCommand(new ReplaceCommand(NULL, $output));
}
/**
diff --git a/core/modules/history/src/Tests/HistoryTest.php b/core/modules/history/src/Tests/HistoryTest.php
index 74e14427853e..a4aa1a5a5763 100644
--- a/core/modules/history/src/Tests/HistoryTest.php
+++ b/core/modules/history/src/Tests/HistoryTest.php
@@ -119,8 +119,8 @@ function testHistory() {
$this->drupalGet('node/' . $nid);
// JavaScript present to record the node read.
$settings = $this->getDrupalSettings();
- $this->assertTrue(isset($settings['ajaxPageState']['js']['core/modules/history/js/history.js']), 'history/api library is present.');
- $this->assertTrue(isset($settings['ajaxPageState']['js']['core/modules/history/js/mark-as-read.js']), 'history/mark-as-read library is present.');
+ $libraries = explode(',', $settings['ajaxPageState']['libraries']);
+ $this->assertTrue(in_array('history/mark-as-read', $libraries), 'history/mark-as-read library is present.');
$this->assertEqual([$nid => TRUE], $settings['history']['nodesToMarkAsRead'], 'drupalSettings to mark node as read are present.');
// Simulate JavaScript: perform HTTP request to mark node as read.
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index c7cc9db33e95..3667f93287c3 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -15,6 +15,7 @@
use Drupal\Component\Utility\UrlHelper;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Url;
+use Drupal\Core\Asset\AttachedAssetsInterface;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Language\Language;
@@ -445,7 +446,7 @@ function locale_cache_flush() {
/**
* Implements hook_js_alter().
*/
-function locale_js_alter(&$javascript) {
+function locale_js_alter(&$javascript, AttachedAssetsInterface $assets) {
$files = array();
foreach ($javascript as $item) {
if (isset($item['type']) && $item['type'] == 'file') {
@@ -543,7 +544,7 @@ function locale_library_info_alter(array &$libraries, $module) {
*
* Generates the values for the altered core/jquery.ui.datepicker library.
*/
-function locale_js_settings_alter(&$settings) {
+function locale_js_settings_alter(&$settings, AttachedAssetsInterface $assets) {
if (isset($settings['jquery']['ui']['datepicker'])) {
$language_interface = \Drupal::languageManager()->getCurrentLanguage();
$settings['jquery']['ui']['datepicker']['isRTL'] = $language_interface->getDirection() == LanguageInterface::DIRECTION_RTL;
diff --git a/core/modules/locale/src/Tests/LocaleLibraryAlterTest.php b/core/modules/locale/src/Tests/LocaleLibraryAlterTest.php
index 7b04c69f2dc5..5b7d6dfef44a 100644
--- a/core/modules/locale/src/Tests/LocaleLibraryAlterTest.php
+++ b/core/modules/locale/src/Tests/LocaleLibraryAlterTest.php
@@ -6,6 +6,7 @@
namespace Drupal\locale\Tests;
+use Drupal\Core\Asset\AttachedAssets;
use Drupal\simpletest\WebTestBase;
/**
@@ -30,10 +31,9 @@ class LocaleLibraryAlterTest extends WebTestBase {
* @see locale_library_alter()
*/
public function testLibraryAlter() {
- $attached['#attached']['library'][] = 'core/jquery.ui.datepicker';
- drupal_render($attached);
- drupal_process_attached($attached);
- $scripts = drupal_get_js();
- $this->assertTrue(strpos($scripts, 'locale.datepicker.js'), 'locale.datepicker.js added to scripts.');
+ $assets = new AttachedAssets();
+ $assets->setLibraries(['core/jquery.ui.datepicker']);
+ $js_assets = $this->container->get('asset.resolver')->getJsAssets($assets, FALSE)[0];
+ $this->assertTrue(array_key_exists('core/modules/locale/locale.datepicker.js', $js_assets), 'locale.datepicker.js added to scripts.');
}
}
diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentUITest.php b/core/modules/menu_link_content/src/Tests/MenuLinkContentUITest.php
index 65404e85142e..a281583b0cec 100644
--- a/core/modules/menu_link_content/src/Tests/MenuLinkContentUITest.php
+++ b/core/modules/menu_link_content/src/Tests/MenuLinkContentUITest.php
@@ -75,9 +75,9 @@ function testTranslationLinkTheme() {
$edit['admin_theme'] = 'seven';
$this->drupalPostForm('admin/appearance', $edit, t('Save configuration'));
$this->drupalGet('admin/structure/menu/item/' . $entityId . '/edit');
- $this->assertRaw('"theme":"seven"', 'Edit uses admin theme.');
+ $this->assertRaw('core/themes/seven/css/base/elements.css', 'Edit uses admin theme.');
$this->drupalGet('admin/structure/menu/item/' . $entityId . '/edit/translations');
- $this->assertRaw('"theme":"seven"', 'Translation uses admin theme as well.');
+ $this->assertRaw('core/themes/seven/css/base/elements.css', 'Translation uses admin theme as well.');
}
}
diff --git a/core/modules/node/src/Tests/NodeTranslationUITest.php b/core/modules/node/src/Tests/NodeTranslationUITest.php
index c9014efd0e4d..54f913ed10be 100644
--- a/core/modules/node/src/Tests/NodeTranslationUITest.php
+++ b/core/modules/node/src/Tests/NodeTranslationUITest.php
@@ -175,13 +175,13 @@ function testTranslationLinkTheme() {
$edit['use_admin_theme'] = TRUE;
$this->drupalPostForm('admin/appearance', $edit, t('Save configuration'));
$this->drupalGet('node/' . $article->id() . '/translations');
- $this->assertRaw('"theme":"seven"', 'Translation uses admin theme if edit is admin.');
+ $this->assertRaw('core/themes/seven/css/base/elements.css', 'Translation uses admin theme if edit is admin.');
// Turn off admin theme for editing, assert inheritance to translations.
$edit['use_admin_theme'] = FALSE;
$this->drupalPostForm('admin/appearance', $edit, t('Save configuration'));
$this->drupalGet('node/' . $article->id() . '/translations');
- $this->assertNoRaw('"theme":"seven"', 'Translation uses frontend theme if edit is frontend.');
+ $this->assertNoRaw('core/themes/seven/css/base/elements.css', 'Translation uses frontend theme if edit is frontend.');
// Assert presence of translation page itself (vs. DisabledBundle below).
$this->assertResponse(200);
diff --git a/core/modules/quickedit/src/QuickEditController.php b/core/modules/quickedit/src/QuickEditController.php
index 0e6d497e610f..339eab4efc30 100644
--- a/core/modules/quickedit/src/QuickEditController.php
+++ b/core/modules/quickedit/src/QuickEditController.php
@@ -142,8 +142,7 @@ public function attachments(Request $request) {
throw new NotFoundHttpException();
}
- $elements['#attached'] = $this->editorSelector->getEditorAttachments($editors);
- drupal_process_attached($elements);
+ $response->setAttachments($this->editorSelector->getEditorAttachments($editors));
return $response;
}
@@ -205,7 +204,12 @@ public function fieldForm(EntityInterface $entity, $field_name, $langcode, $view
$response->addCommand(new FieldFormSavedCommand($output, $other_view_modes));
}
else {
- $response->addCommand(new FieldFormCommand(drupal_render($form)));
+ $output = drupal_render($form);
+ // When working with a hidden form, we don't want its CSS/JS to be loaded.
+ if ($request->request->get('nocssjs') !== 'true') {
+ $response->setAttachments($form['#attached']);
+ }
+ $response->addCommand(new FieldFormCommand($output));
$errors = $form_state->getErrors();
if (count($errors)) {
@@ -216,12 +220,6 @@ public function fieldForm(EntityInterface $entity, $field_name, $langcode, $view
}
}
- // When working with a hidden form, we don't want any CSS or JS to be loaded.
- if ($request->request->get('nocssjs') === 'true') {
- drupal_static_reset('_drupal_add_css');
- drupal_static_reset('_drupal_add_js');
- }
-
return $response;
}
diff --git a/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php b/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php
index a2875155fe26..0cb2c63d0582 100644
--- a/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php
+++ b/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php
@@ -87,9 +87,8 @@ public function testUserWithoutPermission() {
$this->drupalGet('node/1');
// Library and in-place editors.
- $settings = $this->getDrupalSettings();
- $this->assertFalse(isset($settings['ajaxPageState']['js']['core/modules/quickedit/js/quickedit.js']), 'Quick Edit library not loaded.');
- $this->assertFalse(isset($settings['ajaxPageState']['js']['core/modules/quickedit/js/editors/formEditor.js']), "'form' in-place editor not loaded.");
+ $this->assertNoRaw('core/modules/quickedit/js/quickedit.js', 'Quick Edit library not loaded.');
+ $this->assertNoRaw('core/modules/quickedit/js/editors/formEditor.js', "'form' in-place editor not loaded.");
// HTML annotation must always exist (to not break the render cache).
$this->assertRaw('data-quickedit-entity-id="node/1"');
@@ -140,8 +139,9 @@ public function testUserWithPermission() {
// Library and in-place editors.
$settings = $this->getDrupalSettings();
- $this->assertTrue(isset($settings['ajaxPageState']['js']['core/modules/quickedit/js/quickedit.js']), 'Quick Edit library loaded.');
- $this->assertFalse(isset($settings['ajaxPageState']['js']['core/modules/quickedit/js/editors/formEditor.js']), "'form' in-place editor not loaded.");
+ $libraries = explode(',', $settings['ajaxPageState']['libraries']);
+ $this->assertTrue(in_array('quickedit/quickedit', $libraries), 'Quick Edit library loaded.');
+ $this->assertFalse(in_array('quickedit/quickedit.inPlaceEditor.form', $libraries), "'form' in-place editor not loaded.");
// HTML annotation must always exist (to not break the render cache).
$this->assertRaw('data-quickedit-entity-id="node/1"');
@@ -182,7 +182,7 @@ public function testUserWithPermission() {
$this->assertIdentical('settings', $ajax_commands[0]['command'], 'The first AJAX command is a settings command.');
// Second command: insert libraries into DOM.
$this->assertIdentical('insert', $ajax_commands[1]['command'], 'The second AJAX command is an append command.');
- $this->assertTrue(in_array('core/modules/quickedit/js/editors/formEditor.js', array_keys($ajax_commands[0]['settings']['ajaxPageState']['js'])), 'The quickedit.inPlaceEditor.form library is loaded.');
+ $this->assertTrue(in_array('quickedit/quickedit.inPlaceEditor.form', explode(',', $ajax_commands[0]['settings']['ajaxPageState']['libraries'])), 'The quickedit.inPlaceEditor.form library is loaded.');
// Retrieving the form for this field should result in a 200 response,
// containing only a quickeditFieldForm command.
@@ -481,6 +481,7 @@ public function testConcurrentEdit() {
if ($form_tokens_found) {
$post = array(
+ 'nocssjs' => 'true',
'form_id' => 'quickedit_field_form',
'form_token' => $token_match[1],
'form_build_id' => $build_id_match[1],
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index 273bf3c06e37..052e0b75ad9e 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -1,5 +1,6 @@
<?php
+use Drupal\Core\Asset\AttachedAssetsInterface;
use Drupal\Core\Database\Database;
use Drupal\Core\Extension\ExtensionDiscovery;
use Drupal\Core\Render\Element;
@@ -50,7 +51,7 @@ function simpletest_theme() {
/**
* Implements hook_js_alter().
*/
-function simpletest_js_alter(&$javascript) {
+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';
diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
index 7b12fbfbc312..98253a449407 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -1993,12 +1993,7 @@ protected function getAjaxPageStatePostData() {
if (isset($drupal_settings['ajaxPageState'])) {
$post['ajax_page_state[theme]'] = $drupal_settings['ajaxPageState']['theme'];
$post['ajax_page_state[theme_token]'] = $drupal_settings['ajaxPageState']['theme_token'];
- foreach ($drupal_settings['ajaxPageState']['css'] as $key => $value) {
- $post["ajax_page_state[css][$key]"] = 1;
- }
- foreach ($drupal_settings['ajaxPageState']['js'] as $key => $value) {
- $post["ajax_page_state[js][$key]"] = 1;
- }
+ $post['ajax_page_state[libraries]'] = $drupal_settings['ajaxPageState']['libraries'];
}
return $post;
}
diff --git a/core/modules/system/src/Tests/Ajax/DialogTest.php b/core/modules/system/src/Tests/Ajax/DialogTest.php
index 4e295679f32f..f68425123e2b 100644
--- a/core/modules/system/src/Tests/Ajax/DialogTest.php
+++ b/core/modules/system/src/Tests/Ajax/DialogTest.php
@@ -94,7 +94,7 @@ public function testDialog() {
// Emulate going to the JS version of the page and check the JSON response.
$ajax_result = $this->drupalGetAJAX('ajax-test/dialog-contents', array(), array('Accept: application/vnd.drupal-modal'));
- $this->assertEqual($modal_expected_response, $ajax_result[1], 'Modal dialog JSON response matches.');
+ $this->assertEqual($modal_expected_response, $ajax_result[3], 'Modal dialog JSON response matches.');
// Check that requesting a "normal" dialog without JS goes to a page.
$this->drupalGet('ajax-test/dialog-contents');
@@ -136,9 +136,13 @@ public function testDialog() {
$ajax_result = $this->drupalPostAjaxForm('ajax-test/dialog', array(), 'button1');
// Check that CSS and JavaScript are "added" to the page dynamically.
- $this->assertTrue(in_array('dialog.css', array_keys($ajax_result[0]['settings']['ajaxPageState']['css'])), 'jQuery UI dialog CSS added to the page.');
- $this->assertTrue(in_array('core/assets/vendor/jquery.ui/ui/dialog-min.js', array_keys($ajax_result[0]['settings']['ajaxPageState']['js'])), 'jQuery UI dialog JS added to the page.');
- $this->assertTrue(in_array('core/misc/dialog/dialog.ajax.js', array_keys($ajax_result[0]['settings']['ajaxPageState']['js'])), 'Drupal dialog JS added to the page.');
+ $this->assertTrue(in_array('core/drupal.dialog.ajax', explode(',', $ajax_result[0]['settings']['ajaxPageState']['libraries'])), 'core/drupal.dialog.ajax library is added to the page.');
+ $dialog_css_exists = strpos($ajax_result[1]['data'], 'dialog.css') !== FALSE;
+ $this->assertTrue($dialog_css_exists, 'jQuery UI dialog CSS added to the page.');
+ $dialog_js_exists = strpos($ajax_result[2]['data'], 'dialog-min.js') !== FALSE;
+ $this->assertTrue($dialog_js_exists, 'jQuery UI dialog JS added to the page.');
+ $dialog_js_exists = strpos($ajax_result[2]['data'], 'dialog.ajax.js') !== FALSE;
+ $this->assertTrue($dialog_js_exists, 'Drupal dialog JS added to the page.');
// Check that the response matches the expected value.
$this->assertEqual($modal_expected_response, $ajax_result[3], 'POST request modal dialog JSON response matches.');
@@ -169,12 +173,12 @@ public function testDialog() {
],
];
$this->assertEqual($expected_ajax_settings, $ajax_result[0]['settings']['ajax']);
- $this->drupalSetContent($ajax_result[1]['data']);
+ $this->drupalSetContent($ajax_result[3]['data']);
// Remove the data, the form build id and token will never match.
- unset($ajax_result[1]['data']);
+ unset($ajax_result[3]['data']);
$form = $this->xpath("//form[@id='ajax-test-form']");
$this->assertTrue(!empty($form), 'Modal dialog JSON contains form.');
- $this->assertEqual($form_expected_response, $ajax_result[1]);
+ $this->assertEqual($form_expected_response, $ajax_result[3]);
// Check that requesting an entity form dialog without JS goes to a page.
$this->drupalGet('admin/structure/contact/add');
@@ -185,12 +189,12 @@ public function testDialog() {
// Emulate going to the JS version of the form and check the JSON response.
$ajax_result = $this->drupalGetAJAX('admin/structure/contact/add', array(), array('Accept: application/vnd.drupal-modal'));
- $this->drupalSetContent($ajax_result[1]['data']);
+ $this->drupalSetContent($ajax_result[3]['data']);
// Remove the data, the form build id and token will never match.
- unset($ajax_result[1]['data']);
+ unset($ajax_result[3]['data']);
$form = $this->xpath("//form[@id='contact-form-add-form']");
$this->assertTrue(!empty($form), 'Modal dialog JSON contains entity form.');
- $this->assertEqual($entity_form_expected_response, $ajax_result[1]);
+ $this->assertEqual($entity_form_expected_response, $ajax_result[3]);
}
}
diff --git a/core/modules/system/src/Tests/Ajax/FrameworkTest.php b/core/modules/system/src/Tests/Ajax/FrameworkTest.php
index 5b4d2a3b814a..4e0118934a6e 100644
--- a/core/modules/system/src/Tests/Ajax/FrameworkTest.php
+++ b/core/modules/system/src/Tests/Ajax/FrameworkTest.php
@@ -13,6 +13,7 @@
use Drupal\Core\Ajax\HtmlCommand;
use Drupal\Core\Ajax\PrependCommand;
use Drupal\Core\Ajax\SettingsCommand;
+use Drupal\Core\Asset\AttachedAssets;
/**
* Performs tests on AJAX framework functions.
@@ -24,11 +25,10 @@ class FrameworkTest extends AjaxTestBase {
* Ensures \Drupal\Core\Ajax\AjaxResponse::ajaxRender() returns JavaScript settings from the page request.
*/
public function testAJAXRender() {
- // Verify that settings command is generated when JavaScript settings are
- // set via _drupal_add_js().
+ // Verify that settings command is generated if JavaScript settings exist.
$commands = $this->drupalGetAJAX('ajax-test/render');
$expected = new SettingsCommand(array('ajax' => 'test'), TRUE);
- $this->assertCommand($commands, $expected->render(), '\Drupal\Core\Ajax\AjaxResponse::ajaxRender() loads settings added with _drupal_add_js().');
+ $this->assertCommand($commands, $expected->render(), '\Drupal\Core\Ajax\AjaxResponse::ajaxRender() loads JavaScript settings.');
}
/**
@@ -38,16 +38,22 @@ public function testOrder() {
$expected_commands = array();
// Expected commands, in a very specific order.
+ $asset_resolver = \Drupal::service('asset.resolver');
+ $css_collection_renderer = \Drupal::service('asset.css.collection_renderer');
+ $js_collection_renderer = \Drupal::service('asset.js.collection_renderer');
+ $renderer = \Drupal::service('renderer');
$expected_commands[0] = new SettingsCommand(array('ajax' => 'test'), TRUE);
- drupal_static_reset('_drupal_add_css');
$build['#attached']['library'][] = 'ajax_test/order-css-command';
- drupal_process_attached($build);
- $expected_commands[1] = new AddCssCommand(drupal_get_css(_drupal_add_css(), TRUE));
- drupal_static_reset('_drupal_add_js');
+ $assets = AttachedAssets::createFromRenderArray($build);
+ $css_render_array = $css_collection_renderer->render($asset_resolver->getCssAssets($assets, FALSE));
+ $expected_commands[1] = new AddCssCommand($renderer->render($css_render_array));
$build['#attached']['library'][] = 'ajax_test/order-js-command';
- drupal_process_attached($build);
- $expected_commands[2] = new PrependCommand('head', drupal_get_js('header', _drupal_add_js(), TRUE));
- $expected_commands[3] = new AppendCommand('body', drupal_get_js('footer', _drupal_add_js(), TRUE));
+ $assets = AttachedAssets::createFromRenderArray($build);
+ list($js_assets_header, $js_assets_footer) = $asset_resolver->getJsAssets($assets, FALSE);
+ $js_header_render_array = $js_collection_renderer->render($js_assets_header);
+ $js_footer_render_array = $js_collection_renderer->render($js_assets_footer);
+ $expected_commands[2] = new PrependCommand('head', $renderer->render($js_header_render_array));
+ $expected_commands[3] = new AppendCommand('body', $renderer->render($js_footer_render_array));
$expected_commands[4] = new HtmlCommand('body', 'Hello, world!');
// Load any page with at least one CSS file, at least one JavaScript file
@@ -88,50 +94,52 @@ public function testAJAXRenderError() {
* Tests that new JavaScript and CSS files are lazy-loaded on an AJAX request.
*/
public function testLazyLoad() {
+ $asset_resolver = \Drupal::service('asset.resolver');
+ $css_collection_renderer = \Drupal::service('asset.css.collection_renderer');
+ $js_collection_renderer = \Drupal::service('asset.js.collection_renderer');
+ $renderer = \Drupal::service('renderer');
+
$expected = array(
'setting_name' => 'ajax_forms_test_lazy_load_form_submit',
'setting_value' => 'executed',
- 'css' => drupal_get_path('module', 'system') . '/css/system.admin.css',
- 'js' => drupal_get_path('module', 'system') . '/system.js',
+ 'library_1' => 'system/admin',
+ 'library_2' => 'system/drupal.system',
);
- // CSS files are stored by basename, see _drupal_add_css().
- $expected_css_basename = drupal_basename($expected['css']);
-
- // @todo D8: Add a drupal_css_defaults() helper function.
- $expected_css_html = drupal_get_css(array($expected_css_basename => array(
- 'type' => 'file',
- 'group' => CSS_AGGREGATE_DEFAULT,
- 'weight' => 0,
- 'every_page' => FALSE,
- 'media' => 'all',
- 'preprocess' => TRUE,
- 'data' => $expected['css'],
- 'browsers' => array('IE' => TRUE, '!IE' => TRUE),
- )), TRUE);
- $expected_js_html = drupal_get_js('header', array($expected['js'] => ['version' => \Drupal::VERSION] + drupal_js_defaults($expected['js'])), TRUE);
// Get the base page.
$this->drupalGet('ajax_forms_test_lazy_load_form');
$original_settings = $this->getDrupalSettings();
- $original_css = $original_settings['ajaxPageState']['css'];
- $original_js = $original_settings['ajaxPageState']['js'];
+ $original_libraries = explode(',', $original_settings['ajaxPageState']['libraries']);
// Verify that the base page doesn't have the settings and files that are to
// be lazy loaded as part of the next requests.
$this->assertTrue(!isset($original_settings[$expected['setting_name']]), format_string('Page originally lacks the %setting, as expected.', array('%setting' => $expected['setting_name'])));
- $this->assertTrue(!isset($original_css[$expected['css']]), format_string('Page originally lacks the %css file, as expected.', array('%css' => $expected['css'])));
- $this->assertTrue(!isset($original_js[$expected['js']]), format_string('Page originally lacks the %js file, as expected.', array('%js' => $expected['js'])));
+ $this->assertTrue(!in_array($expected['library_1'], $original_libraries), format_string('Page originally lacks the %library library, as expected.', array('%library' => $expected['library_1'])));
+ $this->assertTrue(!in_array($expected['library_2'], $original_libraries), format_string('Page originally lacks the %library library, as expected.', array('%library' => $expected['library_2'])));
+
+ // Calculate the expected CSS and JS.
+ $assets = new AttachedAssets();
+ $assets->setLibraries([$expected['library_1']])
+ ->setAlreadyLoadedLibraries($original_libraries);
+ $css_render_array = $css_collection_renderer->render($asset_resolver->getCssAssets($assets, FALSE));
+ $expected_css_html = $renderer->render($css_render_array);
+
+ $assets->setLibraries([$expected['library_2']])
+ ->setAlreadyLoadedLibraries($original_libraries);
+ $js_assets = $asset_resolver->getJsAssets($assets, FALSE)[0];
+ unset($js_assets['drupalSettings']);
+ $js_render_array = $js_collection_renderer->render($js_assets);
+ $expected_js_html = $renderer->render($js_render_array);
// Submit the AJAX request without triggering files getting added.
$commands = $this->drupalPostAjaxForm(NULL, array('add_files' => FALSE), array('op' => t('Submit')));
$new_settings = $this->getDrupalSettings();
- $new_css = $new_settings['ajaxPageState']['css'];
- $new_js = $new_settings['ajaxPageState']['js'];
+ $new_libraries = explode(',', $new_settings['ajaxPageState']['libraries']);
// Verify the setting was not added when not expected.
$this->assertTrue(!isset($new_settings[$expected['setting_name']]), format_string('Page still lacks the %setting, as expected.', array('%setting' => $expected['setting_name'])));
- $this->assertTrue(!isset($new_css[$expected['css']]), format_string('Page still lacks the %css file, as expected.', array('%css' => $expected['css'])));
- $this->assertTrue(!isset($new_js[$expected['js']]), format_string('Page still lacks the %js file, as expected.', array('%js' => $expected['js'])));
+ $this->assertTrue(!in_array($expected['library_1'], $new_libraries), format_string('Page still lacks the %library library, as expected.', array('%library' => $expected['library_1'])));
+ $this->assertTrue(!in_array($expected['library_2'], $new_libraries), format_string('Page still lacks the %library library, as expected.', array('%library' => $expected['library_2'])));
// Verify a settings command does not add CSS or scripts to drupalSettings
// and no command inserts the corresponding tags on the page.
$found_settings_command = FALSE;
@@ -144,14 +152,13 @@ public function testLazyLoad() {
$found_markup_command = TRUE;
}
}
- $this->assertFalse($found_settings_command, format_string('Page state still lacks the %css and %js files, as expected.', array('%css' => $expected['css'], '%js' => $expected['js'])));
- $this->assertFalse($found_markup_command, format_string('Page still lacks the %css and %js files, as expected.', array('%css' => $expected['css'], '%js' => $expected['js'])));
+ $this->assertFalse($found_settings_command, format_string('Page state still lacks the %library_1 and %library_2 libraries, as expected.', array('%library_1' => $expected['library_1'], '%library_2' => $expected['library_2'])));
+ $this->assertFalse($found_markup_command, format_string('Page still lacks the %library_1 and %library_2 libraries, as expected.', array('%library_1' => $expected['library_1'], '%library_2' => $expected['library_2'])));
// Submit the AJAX request and trigger adding files.
$commands = $this->drupalPostAjaxForm(NULL, array('add_files' => TRUE), array('op' => t('Submit')));
$new_settings = $this->getDrupalSettings();
- $new_css = $new_settings['ajaxPageState']['css'];
- $new_js = $new_settings['ajaxPageState']['js'];
+ $new_libraries = explode(',', $new_settings['ajaxPageState']['libraries']);
// Verify the expected setting was added, both to drupalSettings, and as
// the first AJAX command.
@@ -161,8 +168,8 @@ public function testLazyLoad() {
// Verify the expected CSS file was added, both to drupalSettings, and as
// the second AJAX command for inclusion into the HTML.
- $this->assertEqual($new_css, $original_css + array($expected_css_basename => 1), format_string('Page state now has the %css file.', array('%css' => $expected['css'])));
- $this->assertCommand(array_slice($commands, 1, 1), array('data' => $expected_css_html), format_string('Page now has the %css file.', array('%css' => $expected['css'])));
+ $this->assertTrue(in_array($expected['library_1'], $new_libraries), format_string('Page state now has the %library library.', array('%library' => $expected['library_1'])));
+ $this->assertCommand(array_slice($commands, 1, 1), array('data' => $expected_css_html), format_string('Page now has the %library library.', array('%library' => $expected['library_1'])));
// Verify the expected JS file was added, both to drupalSettings, and as
// the third AJAX command for inclusion into the HTML. By testing for an
@@ -170,8 +177,8 @@ public function testLazyLoad() {
// unexpected JavaScript code, such as a jQuery.extend() that would
// potentially clobber rather than properly merge settings, didn't
// accidentally get added.
- $this->assertEqual($new_js, $original_js + array($expected['js'] => 1), format_string('Page state now has the %js file.', array('%js' => $expected['js'])));
- $this->assertCommand(array_slice($commands, 2, 1), array('data' => $expected_js_html), format_string('Page now has the %js file.', array('%js' => $expected['js'])));
+ $this->assertTrue(in_array($expected['library_2'], $new_libraries), format_string('Page state now has the %library library.', array('%library' => $expected['library_2'])));
+ $this->assertCommand(array_slice($commands, 2, 1), array('data' => $expected_js_html), format_string('Page now has the %library library.', array('%library' => $expected['library_2'])));
}
/**
diff --git a/core/modules/system/src/Tests/Common/AttachedAssetsTest.php b/core/modules/system/src/Tests/Common/AttachedAssetsTest.php
index 8401acfbfbf5..7cd97b384806 100644
--- a/core/modules/system/src/Tests/Common/AttachedAssetsTest.php
+++ b/core/modules/system/src/Tests/Common/AttachedAssetsTest.php
@@ -10,6 +10,7 @@
use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\Unicode;
use Drupal\Component\Utility\Crypt;
+use Drupal\Core\Asset\AttachedAssets;
use Drupal\simpletest\KernelTestBase;
/**
@@ -27,6 +28,20 @@
*/
class AttachedAssetsTest extends KernelTestBase {
+ /**
+ * The asset resolver service.
+ *
+ * @var \Drupal\Core\Asset\AssetResolverInterface
+ */
+ protected $assetResolver;
+
+ /**
+ * The renderer service.
+ *
+ * @var \Drupal\Core\Render\RendererInterface
+ */
+ protected $renderer;
+
/**
* {@inheritdoc}
*/
@@ -38,29 +53,19 @@ class AttachedAssetsTest extends KernelTestBase {
protected function setUp() {
parent::setUp();
- // Disable preprocessing.
- $this->config('system.performance')
- ->set('css.preprocess', FALSE)
- ->set('js.preprocess', FALSE)
- ->save();
-
- // Reset _drupal_add_css() and _drupal_add_js() statics before each test.
- drupal_static_reset('_drupal_add_css');
- drupal_static_reset('_drupal_add_js');
-
- $this->installSchema('system', 'router');
- \Drupal::service('router.builder')->rebuild();
+ $this->assetResolver = $this->container->get('asset.resolver');
+ $this->renderer = $this->container->get('renderer');
}
/**
* Tests that default CSS and JavaScript is empty.
*/
function testDefault() {
- $build['#attached'] = [];
- drupal_process_attached($build);
-
- $this->assertEqual(array(), _drupal_add_css(), 'Default CSS is empty.');
- $this->assertEqual(array(), _drupal_add_js(), 'Default JavaScript is empty.');
+ $assets = new AttachedAssets();
+ $this->assertEqual(array(), $this->assetResolver->getCssAssets($assets, FALSE), 'Default CSS is empty.');
+ list($js_assets_header, $js_assets_footer) = $this->assetResolver->getJsAssets($assets, FALSE);
+ $this->assertEqual(array(), $js_assets_header, 'Default header JavaScript is empty.');
+ $this->assertEqual(array(), $js_assets_footer, 'Default footer JavaScript is empty.');
}
/**
@@ -68,10 +73,9 @@ function testDefault() {
*/
function testLibraryUnknown() {
$build['#attached']['library'][] = 'unknown/unknown';
- drupal_process_attached($build);
+ $assets = AttachedAssets::createFromRenderArray($build);
- $scripts = drupal_get_js();
- $this->assertTrue(strpos($scripts, 'unknown') === FALSE, 'Unknown library was not added to the page.');
+ $this->assertIdentical([], $this->assetResolver->getJsAssets($assets, FALSE)[0], 'Unknown library was not added to the page.');
}
/**
@@ -79,15 +83,17 @@ function testLibraryUnknown() {
*/
function testAddFiles() {
$build['#attached']['library'][] = 'common_test/files';
- drupal_process_attached($build);
+ $assets = AttachedAssets::createFromRenderArray($build);
- $css = _drupal_add_css();
- $js = _drupal_add_js();
+ $css = $this->assetResolver->getCssAssets($assets, FALSE);
+ $js = $this->assetResolver->getJsAssets($assets, FALSE)[0];
$this->assertTrue(array_key_exists('bar.css', $css), 'CSS files are correctly added.');
$this->assertTrue(array_key_exists('core/modules/system/tests/modules/common_test/foo.js', $js), 'JavaScript files are correctly added.');
- $rendered_css = drupal_get_css();
- $rendered_js = drupal_get_js();
+ $css_render_array = \Drupal::service('asset.css.collection_renderer')->render($css);
+ $js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
+ $rendered_css = $this->renderer->render($css_render_array);
+ $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_css, '<link rel="stylesheet" href="' . file_create_url('core/modules/system/tests/modules/common_test/bar.css') . '?' . $query_string . '" media="all" />'), FALSE, 'Rendering an external CSS file.');
$this->assertNotIdentical(strpos($rendered_js, '<script src="' . file_create_url('core/modules/system/tests/modules/common_test/foo.js') . '?' . $query_string . '"></script>'), FALSE, 'Rendering an external JavaScript file.');
@@ -99,12 +105,13 @@ function testAddFiles() {
function testAddJsSettings() {
// Add a file in order to test default settings.
$build['#attached']['library'][] = 'core/drupalSettings';
- drupal_process_attached($build);
+ $assets = AttachedAssets::createFromRenderArray($build);
- $javascript = _drupal_add_js();
+ $javascript = $this->assetResolver->getJsAssets($assets, FALSE)[0];
$this->assertTrue(array_key_exists('currentPath', $javascript['drupalSettings']['data']['path']), 'The current path JavaScript setting is set correctly.');
- $javascript = _drupal_add_js(array('drupal' => 'rocks', 'dries' => 280342800), 'setting');
+ $assets->setSettings(['drupal' => 'rocks', 'dries' => 280342800]);
+ $javascript = $this->assetResolver->getJsAssets($assets, FALSE)[0];
$this->assertEqual(280342800, $javascript['drupalSettings']['data']['dries'], 'JavaScript setting is set correctly.');
$this->assertEqual('rocks', $javascript['drupalSettings']['data']['drupal'], 'The other JavaScript setting is set correctly.');
}
@@ -114,15 +121,17 @@ function testAddJsSettings() {
*/
function testAddExternalFiles() {
$build['#attached']['library'][] = 'common_test/external';
- drupal_process_attached($build);
+ $assets = AttachedAssets::createFromRenderArray($build);
- $css = _drupal_add_css();
- $js = _drupal_add_js();
+ $css = $this->assetResolver->getCssAssets($assets, FALSE);
+ $js = $this->assetResolver->getJsAssets($assets, FALSE)[0];
$this->assertTrue(array_key_exists('http://example.com/stylesheet.css', $css), 'External CSS files are correctly added.');
$this->assertTrue(array_key_exists('http://example.com/script.js', $js), 'External JavaScript files are correctly added.');
- $rendered_css = drupal_get_css();
- $rendered_js = drupal_get_js();
+ $css_render_array = \Drupal::service('asset.css.collection_renderer')->render($css);
+ $js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
+ $rendered_css = $this->renderer->render($css_render_array);
+ $rendered_js = $this->renderer->render($js_render_array);
$this->assertNotIdentical(strpos($rendered_css, '<link rel="stylesheet" href="http://example.com/stylesheet.css" media="all" />'), FALSE, 'Rendering an external CSS file.');
$this->assertNotIdentical(strpos($rendered_js, '<script src="http://example.com/script.js"></script>'), FALSE, 'Rendering an external JavaScript file.');
}
@@ -132,9 +141,11 @@ function testAddExternalFiles() {
*/
function testAttributes() {
$build['#attached']['library'][] = 'common_test/js-attributes';
- drupal_process_attached($build);
+ $assets = AttachedAssets::createFromRenderArray($build);
- $rendered_js = drupal_get_js();
+ $js = $this->assetResolver->getJsAssets($assets, FALSE)[0];
+ $js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
+ $rendered_js = $this->renderer->render($js_render_array);
$expected_1 = '<script src="http://example.com/deferred-external.js" foo="bar" defer></script>';
$expected_2 = '<script src="' . file_create_url('core/modules/system/tests/modules/common_test/deferred-internal.js') . '?v=1" defer bar="foo"></script>';
$this->assertNotIdentical(strpos($rendered_js, $expected_1), FALSE, 'Rendered external JavaScript with correct defer and random attributes.');
@@ -145,13 +156,12 @@ function testAttributes() {
* Tests that attributes are maintained when JS aggregation is enabled.
*/
function testAggregatedAttributes() {
- // Enable aggregation.
- $this->config('system.performance')->set('js.preprocess', 1)->save();
-
$build['#attached']['library'][] = 'common_test/js-attributes';
- drupal_process_attached($build);
+ $assets = AttachedAssets::createFromRenderArray($build);
- $rendered_js = drupal_get_js();
+ $js = $this->assetResolver->getJsAssets($assets, TRUE)[0];
+ $js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
+ $rendered_js = $this->renderer->render($js_render_array);
$expected_1 = '<script src="http://example.com/deferred-external.js" foo="bar" defer></script>';
$expected_2 = '<script src="' . file_create_url('core/modules/system/tests/modules/common_test/deferred-internal.js') . '?v=1" defer bar="foo"></script>';
$this->assertNotIdentical(strpos($rendered_js, $expected_1), FALSE, 'Rendered external JavaScript with correct defer and random attributes.');
@@ -166,9 +176,11 @@ function testHeaderSetting() {
$build['#attached']['library'][] = 'core/drupalSettings';
// Nonsensical value to verify if it's possible to override path settings.
$build['#attached']['drupalSettings']['path']['pathPrefix'] = 'yarhar';
- drupal_process_attached($build);
+ $assets = AttachedAssets::createFromRenderArray($build);
- $rendered_js = drupal_get_js('header');
+ $js = $this->assetResolver->getJsAssets($assets, FALSE)[0];
+ $js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
+ $rendered_js = $this->renderer->render($js_render_array);
// Parse the generated drupalSettings <script> back to a PHP representation.
$startToken = 'drupalSettings = ';
@@ -199,21 +211,23 @@ function testHeaderSetting() {
*/
function testFooterHTML() {
$build['#attached']['library'][] = 'common_test/js-footer';
- drupal_process_attached($build);
+ $assets = AttachedAssets::createFromRenderArray($build);
- $rendered_js = drupal_get_js('footer');
+ $js = $this->assetResolver->getJsAssets($assets, FALSE)[1];
+ $js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
+ $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, '<script src="' . file_create_url('core/modules/system/tests/modules/common_test/footer.js') . '?' . $query_string . '"></script>'), FALSE, 'Rendering an external JavaScript file.');
}
/**
- * Tests _drupal_add_js() sets preprocess to FALSE when cache is also FALSE.
+ * Tests that for assets with cache = FALSE, Drupal sets preprocess = FALSE.
*/
function testNoCache() {
$build['#attached']['library'][] = 'common_test/no-cache';
- drupal_process_attached($build);
+ $assets = AttachedAssets::createFromRenderArray($build);
- $js = _drupal_add_js();
+ $js = $this->assetResolver->getJsAssets($assets, FALSE)[0];
$this->assertFalse($js['core/modules/system/tests/modules/common_test/nocache.js']['preprocess'], 'Setting cache to FALSE sets preprocess to FALSE when adding JavaScript.');
}
@@ -226,14 +240,16 @@ function testBrowserConditionalComments() {
$default_query_string = $this->container->get('state')->get('system.css_js_query_string') ?: '0';
$build['#attached']['library'][] = 'common_test/browsers';
- drupal_process_attached($build);
+ $assets = AttachedAssets::createFromRenderArray($build);
- $js = drupal_get_js();
+ $js = $this->assetResolver->getJsAssets($assets, FALSE)[0];
+ $js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
+ $rendered_js = $this->renderer->render($js_render_array);
$expected_1 = "<!--[if lte IE 8]>\n" . '<script src="' . file_create_url('core/modules/system/tests/modules/common_test/old-ie.js') . '?' . $default_query_string . '"></script>' . "\n<![endif]-->";
$expected_2 = "<!--[if !IE]><!-->\n" . '<script src="' . file_create_url('core/modules/system/tests/modules/common_test/no-ie.js') . '?' . $default_query_string . '"></script>' . "\n<!--<![endif]-->";
- $this->assertNotIdentical(strpos($js, $expected_1), FALSE, 'Rendered JavaScript within downlevel-hidden conditional comments.');
- $this->assertNotIdentical(strpos($js, $expected_2), FALSE, 'Rendered JavaScript within downlevel-revealed conditional comments.');
+ $this->assertNotIdentical(strpos($rendered_js, $expected_1), FALSE, 'Rendered JavaScript within downlevel-hidden conditional comments.');
+ $this->assertNotIdentical(strpos($rendered_js, $expected_2), FALSE, 'Rendered JavaScript within downlevel-revealed conditional comments.');
}
/**
@@ -242,10 +258,12 @@ function testBrowserConditionalComments() {
function testVersionQueryString() {
$build['#attached']['library'][] = 'core/backbone';
$build['#attached']['library'][] = 'core/domready';
- drupal_process_attached($build);
+ $assets = AttachedAssets::createFromRenderArray($build);
- $js = drupal_get_js();
- $this->assertTrue(strpos($js, 'core/assets/vendor/backbone/backbone-min.js?v=1.1.2') > 0 && strpos($js, 'core/assets/vendor/domready/ready.min.js?v=1.0.7') > 0 , 'JavaScript version identifiers correctly appended to URLs');
+ $js = $this->assetResolver->getJsAssets($assets, FALSE)[0];
+ $js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
+ $rendered_js = $this->renderer->render($js_render_array);
+ $this->assertTrue(strpos($rendered_js, 'core/assets/vendor/backbone/backbone-min.js?v=1.1.2') > 0 && strpos($rendered_js, 'core/assets/vendor/domready/ready.min.js?v=1.0.7') > 0 , 'JavaScript version identifiers correctly appended to URLs');
}
/**
@@ -253,7 +271,7 @@ function testVersionQueryString() {
*/
function testRenderOrder() {
$build['#attached']['library'][] = 'common_test/order';
- drupal_process_attached($build);
+ $assets = AttachedAssets::createFromRenderArray($build);
// Construct the expected result from the regex.
$expected_order_js = [
@@ -270,7 +288,9 @@ function testRenderOrder() {
];
// Retrieve the rendered JavaScript and test against the regex.
- $rendered_js = drupal_get_js();
+ $js = $this->assetResolver->getJsAssets($assets, FALSE)[0];
+ $js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
+ $rendered_js = $this->renderer->render($js_render_array);
$matches = array();
if (preg_match_all('/weight_([-0-9]+_[0-9]+)/', $rendered_js, $matches)) {
$result = $matches[1];
@@ -309,8 +329,10 @@ function testRenderOrder() {
'theme_weight_0_2',
];
- // Retrieve the rendered JavaScript and test against the regex.
- $rendered_css = drupal_get_css();
+ // Retrieve the rendered CSS and test against the regex.
+ $css = $this->assetResolver->getCssAssets($assets, FALSE);
+ $css_render_array = \Drupal::service('asset.css.collection_renderer')->render($css);
+ $rendered_css = $this->renderer->render($css_render_array);
$matches = array();
if (preg_match_all('/([a-z]+)_weight_([-0-9]+_[0-9]+)/', $rendered_css, $matches)) {
$result = $matches[0];
@@ -329,12 +351,14 @@ function testRenderDifferentWeight() {
// still make itself appear first by defining a lower weight.
$build['#attached']['library'][] = 'core/jquery';
$build['#attached']['library'][] = 'common_test/weight';
- drupal_process_attached($build);
-
- $js = drupal_get_js();
- $this->assertTrue(strpos($js, 'lighter.css') < strpos($js, 'first.js'), 'Lighter CSS assets are rendered first.');
- $this->assertTrue(strpos($js, 'lighter.js') < strpos($js, 'first.js'), 'Lighter JavaScript assets are rendered first.');
- $this->assertTrue(strpos($js, 'before-jquery.js') < strpos($js, 'core/assets/vendor/jquery/jquery.min.js'), 'Rendering a JavaScript file above jQuery.');
+ $assets = AttachedAssets::createFromRenderArray($build);
+
+ $js = $this->assetResolver->getJsAssets($assets, FALSE)[0];
+ $js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
+ $rendered_js = $this->renderer->render($js_render_array);
+ $this->assertTrue(strpos($rendered_js, 'lighter.css') < strpos($rendered_js, 'first.js'), 'Lighter CSS assets are rendered first.');
+ $this->assertTrue(strpos($rendered_js, 'lighter.js') < strpos($rendered_js, 'first.js'), 'Lighter JavaScript assets are rendered first.');
+ $this->assertTrue(strpos($rendered_js, 'before-jquery.js') < strpos($rendered_js, 'core/assets/vendor/jquery/jquery.min.js'), 'Rendering a JavaScript file above jQuery.');
}
/**
@@ -346,13 +370,15 @@ function testAlter() {
// Add both tableselect.js and simpletest.js.
$build['#attached']['library'][] = 'core/drupal.tableselect';
$build['#attached']['library'][] = 'simpletest/drupal.simpletest';
- drupal_process_attached($build);
+ $assets = AttachedAssets::createFromRenderArray($build);
// Render the JavaScript, testing if simpletest.js was altered to be before
// tableselect.js. See simpletest_js_alter() to see where this alteration
// takes place.
- $js = drupal_get_js();
- $this->assertTrue(strpos($js, 'simpletest.js') < strpos($js, 'core/misc/tableselect.js'), 'Altering JavaScript weight through the alter hook.');
+ $js = $this->assetResolver->getJsAssets($assets, FALSE)[0];
+ $js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
+ $rendered_js = $this->renderer->render($js_render_array);
+ $this->assertTrue(strpos($rendered_js, 'simpletest.js') < strpos($rendered_js, 'core/misc/tableselect.js'), 'Altering JavaScript weight through the alter hook.');
}
/**
@@ -369,9 +395,11 @@ function testLibraryAlter() {
// common_test_library_info_alter() also added a dependency on jQuery Form.
$build['#attached']['library'][] = 'core/jquery.farbtastic';
- drupal_process_attached($build);
- $scripts = drupal_get_js();
- $this->assertTrue(strpos($scripts, 'core/assets/vendor/jquery-form/jquery.form.js'), 'Altered library dependencies are added to the page.');
+ $assets = AttachedAssets::createFromRenderArray($build);
+ $js = $this->assetResolver->getJsAssets($assets, FALSE)[0];
+ $js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
+ $rendered_js = $this->renderer->render($js_render_array);
+ $this->assertTrue(strpos($rendered_js, 'core/assets/vendor/jquery-form/jquery.form.js'), 'Altered library dependencies are added to the page.');
}
/**
@@ -413,15 +441,17 @@ function testLibraryNameConflicts() {
*/
function testAddJsFileWithQueryString() {
$build['#attached']['library'][] = 'common_test/querystring';
- drupal_process_attached($build);
+ $assets = AttachedAssets::createFromRenderArray($build);
- $css = _drupal_add_css();
- $js = _drupal_add_js();
+ $css = $this->assetResolver->getCssAssets($assets, FALSE);
+ $js = $this->assetResolver->getJsAssets($assets, FALSE)[0];
$this->assertTrue(array_key_exists('querystring.css?arg1=value1&arg2=value2', $css), 'CSS file with query string is correctly added.');
$this->assertTrue(array_key_exists('core/modules/system/tests/modules/common_test/querystring.js?arg1=value1&arg2=value2', $js), 'JavaScript file with query string is correctly added.');
- $rendered_css = drupal_get_css();
- $rendered_js = drupal_get_js();
+ $css_render_array = \Drupal::service('asset.css.collection_renderer')->render($css);
+ $rendered_css = $this->renderer->render($css_render_array);
+ $js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
+ $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_css, '<link rel="stylesheet" href="' . str_replace('&', '&', file_create_url('core/modules/system/tests/modules/common_test/querystring.css?arg1=value1&arg2=value2')) . '&' . $query_string . '" media="all" />'), FALSE, 'CSS file with query string gets version query string correctly appended..');
$this->assertNotIdentical(strpos($rendered_js, '<script src="' . str_replace('&', '&', file_create_url('core/modules/system/tests/modules/common_test/querystring.js?arg1=value1&arg2=value2')) . '&' . $query_string . '"></script>'), FALSE, 'JavaScript file with query string gets version query string correctly appended.');
diff --git a/core/modules/system/src/Tests/Theme/TableTest.php b/core/modules/system/src/Tests/Theme/TableTest.php
index 412cb8e2386b..88aa25fa59f0 100644
--- a/core/modules/system/src/Tests/Theme/TableTest.php
+++ b/core/modules/system/src/Tests/Theme/TableTest.php
@@ -46,10 +46,8 @@ function testThemeTableStickyHeaders() {
'#sticky' => TRUE,
);
$this->render($table);
- $js = _drupal_add_js();
- $this->assertTrue(isset($js['core/misc/tableheader.js']), 'tableheader.js found.');
+ $this->assertTrue(in_array('core/drupal.tableheader', $table['#attached']['library']), 'tableheader asset library found.');
$this->assertRaw('sticky-enabled');
- drupal_static_reset('_drupal_add_js');
}
/**
@@ -71,10 +69,8 @@ function testThemeTableNoStickyHeaders() {
'#sticky' => FALSE,
);
$this->render($table);
- $js = _drupal_add_js();
- $this->assertFalse(isset($js['core/misc/tableheader.js']), 'tableheader.js not found.');
+ $this->assertFalse(in_array('core/drupal.tableheader', $table['#attached']['library']), 'tableheader asset library not found.');
$this->assertNoRaw('sticky-enabled');
- drupal_static_reset('_drupal_add_js');
}
/**
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 458815422b60..c75cf18901c5 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -6,6 +6,7 @@
*/
use Drupal\Component\Utility\UrlHelper;
+use Drupal\Core\Asset\AttachedAssetsInterface;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Extension\Extension;
use Drupal\Core\Extension\ExtensionDiscovery;
@@ -618,9 +619,9 @@ function system_page_attachments(array &$page) {
/**
* Implements hook_js_settings_alter().
*
- * Generates the values for the core/drupalSettings library.
+ * Sets values for the core/drupalSettings and core/drupal.ajax libraries.
*/
-function system_js_settings_alter(&$settings) {
+function system_js_settings_alter(&$settings, AttachedAssetsInterface $assets) {
// url() generates the script and prefix using hook_url_outbound_alter().
// Instead of running the hook_url_outbound_alter() again here, extract
// them from url().
@@ -656,6 +657,37 @@ function system_js_settings_alter(&$settings) {
if (!isset($settings['locale']['pluralDelimiter'])) {
$settings['locale']['pluralDelimiter'] = LOCALE_PLURAL_DELIMITER;
}
+
+ // Now generate the values for the core/drupal.ajax library.
+ // We need to send ajaxPageState settings for core/drupal.ajax if:
+ // - ajaxPageState is being loaded in this Response, in which case it will
+ // already exist at $settings['ajaxPageState'] (because the core/drupal.ajax
+ // library definition specifies a placeholder 'ajaxPageState' setting).
+ // - core/drupal.ajax already has been loaded and hence this is an AJAX
+ // Response in which we must send the list of extra asset libraries that are
+ // being added in this AJAX Response.
+ /** @var \Drupal\Core\Asset\LibraryDependencyResolver $library_dependency_resolver */
+ $library_dependency_resolver = \Drupal::service('library.dependency_resolver');
+ if (isset($settings['ajaxPageState']) || in_array('core/drupal.ajax', $library_dependency_resolver->getLibrariesWithDependencies($assets->getAlreadyLoadedLibraries()))) {
+ // Provide the page with information about the theme that's used, so that
+ // a later AJAX request can be rendered using the same theme.
+ // @see \Drupal\Core\Theme\AjaxBasePageNegotiator
+ $theme_key = \Drupal::theme()->getActiveTheme()->getName();
+ $settings['ajaxPageState']['theme'] = $theme_key;
+ // Checks that the DB is available before filling theme_token.
+ if (!defined('MAINTENANCE_MODE')) {
+ $settings['ajaxPageState']['theme_token'] = \Drupal::csrfToken()->get($theme_key);
+ }
+
+ // Provide the page with information about the individual asset libraries
+ // used, information not otherwise available when aggregation is enabled.
+ $minimal_libraries = $library_dependency_resolver->getMinimalRepresentativeSubset(array_merge(
+ $assets->getLibraries(),
+ $assets->getAlreadyLoadedLibraries()
+ ));
+ sort($minimal_libraries);
+ $settings['ajaxPageState']['libraries'] = implode(',', $minimal_libraries);
+ }
}
/**
diff --git a/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module b/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
index 2665c30d9953..3e470884db09 100644
--- a/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
+++ b/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
@@ -184,5 +184,15 @@ function ajax_forms_test_validation_number_form_callback($form, FormStateInterfa
* AJAX form callback: Selects for the ajax_forms_test_lazy_load_form() form.
*/
function ajax_forms_test_lazy_load_form_ajax($form, FormStateInterface $form_state) {
- return array('#markup' => 'new content');
+ $build = [
+ '#markup' => 'new content',
+ ];
+
+ if ($form_state->getValue('add_files')) {
+ $build['#attached']['library'][] = 'system/admin';
+ $build['#attached']['library'][] = 'system/drupal.system';
+ $build['#attached']['drupalSettings']['ajax_forms_test_lazy_load_form_submit'] = 'executed';
+ }
+
+ return $build;
}
diff --git a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestLazyLoadForm.php b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestLazyLoadForm.php
index 41e8499bd59a..fb4e010c3c9b 100644
--- a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestLazyLoadForm.php
+++ b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestLazyLoadForm.php
@@ -53,21 +53,6 @@ public function buildForm(array $form, FormStateInterface $form_state) {
* {@inheritdoc}
*/
public function submitForm(array &$form, FormStateInterface $form_state) {
- if ($form_state->getValue('add_files')) {
- $attached = [
- '#attached' => [
- 'library' => [
- 'system/admin',
- 'system/drupal.system',
- ],
- 'drupalSettings' => [
- 'ajax_forms_test_lazy_load_form_submit' => 'executed',
- ],
- ],
- ];
- drupal_render($attached);
- drupal_process_attached($attached);
- }
$form_state->setRebuild();
}
diff --git a/core/modules/system/tests/modules/ajax_test/ajax_test.module b/core/modules/system/tests/modules/ajax_test/ajax_test.module
index d81da66ec830..d1faba3e4769 100644
--- a/core/modules/system/tests/modules/ajax_test/ajax_test.module
+++ b/core/modules/system/tests/modules/ajax_test/ajax_test.module
@@ -10,51 +10,8 @@
use Drupal\Core\Ajax\OpenDialogCommand;
use Drupal\Core\Ajax\OpenModalDialogCommand;
use Drupal\Core\Ajax\CloseDialogCommand;
-use Drupal\Core\Ajax\HtmlCommand;
use Drupal\Core\Url;
-/**
- * Menu callback: Returns an element suitable for use by
- * \Drupal\Core\Ajax\AjaxResponse::ajaxRender().
- *
- * Additionally ensures that \Drupal\Core\Ajax\AjaxResponse::ajaxRender()
- * incorporates JavaScript settings generated during the page request by
- * invoking _drupal_add_js() with a dummy setting.
- *
- * @deprecated \Drupal\ajax_test\Controller\AjaxTestController::render()
- */
-function ajax_test_render() {
- $attached = array(
- '#attached' => array(
- 'drupalSettings' => array(
- 'ajax' => 'test',
- ),
- ),
- );
- // @todo Why is this being tested via an explicit drupal_render() call?
- drupal_render($attached);
- drupal_process_attached($attached);
- $response = new AjaxResponse();
- return $response;
-}
-
-/**
- * Menu callback: Returns an AjaxResponse; settings command set last.
- *
- * Helps verifying AjaxResponse reorders commands to ensure correct execution.
- *
- * @deprecated \Drupal\ajax_test\Controller\AjaxTestController::order()
- */
-function ajax_test_order() {
- $response = new AjaxResponse();
- // HTML insertion command.
- $response->addCommand(new HtmlCommand('body', 'Hello, world!'));
- $build['#attached']['library'][] = 'ajax_test/order';
- drupal_process_attached($build);
-
- return $response;
-}
-
/**
* Menu callback: Returns AJAX element with #error property set.
*
diff --git a/core/modules/system/tests/modules/ajax_test/src/Controller/AjaxTestController.php b/core/modules/system/tests/modules/ajax_test/src/Controller/AjaxTestController.php
index ab25fdee277e..c4d40bdec9c9 100644
--- a/core/modules/system/tests/modules/ajax_test/src/Controller/AjaxTestController.php
+++ b/core/modules/system/tests/modules/ajax_test/src/Controller/AjaxTestController.php
@@ -7,6 +7,8 @@
namespace Drupal\ajax_test\Controller;
+use Drupal\Core\Ajax\AjaxResponse;
+use Drupal\Core\Ajax\HtmlCommand;
use Drupal\Core\Url;
/**
@@ -23,17 +25,38 @@ public function dialogContents() {
}
/**
- * @todo Remove ajax_test_render().
+ * Returns a render array that will be rendered by AjaxRenderer.
+ *
+ * Ensures that \Drupal\Core\Ajax\AjaxResponse::ajaxRender()
+ * incorporates JavaScript settings generated during the page request by
+ * adding a dummy setting.
*/
public function render() {
- return ajax_test_render();
+ return [
+ '#attached' => [
+ 'library' => [
+ 'core/drupalSettings',
+ ],
+ 'drupalSettings' => [
+ 'ajax' => 'test',
+ ],
+ ],
+ ];
}
/**
- * @todo Remove ajax_test_order().
+ * Returns an AjaxResponse; settings command set last.
+ *
+ * Helps verifying AjaxResponse reorders commands to ensure correct execution.
*/
public function order() {
- return ajax_test_order();
+ $response = new AjaxResponse();
+ // HTML insertion command.
+ $response->addCommand(new HtmlCommand('body', 'Hello, world!'));
+ $build['#attached']['library'][] = 'ajax_test/order';
+ $response->setAttachments($build['#attached']);
+
+ return $response;
}
/**
diff --git a/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestDialogForm.php b/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestDialogForm.php
index 946504d06746..c2a6a079108e 100644
--- a/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestDialogForm.php
+++ b/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestDialogForm.php
@@ -101,6 +101,12 @@ protected function dialog($is_modal = FALSE) {
$response = new AjaxResponse();
$title = $this->t('AJAX Dialog contents');
$html = drupal_render($content);
+
+ // Attach the library necessary for using the Open(Modal)DialogCommand and
+ // set the attachments for this Ajax response.
+ $content['#attached']['library'][] = 'core/drupal.dialog.ajax';
+ $response->setAttachments($content['#attached']);
+
if ($is_modal) {
$response->addCommand(new OpenModalDialogCommand($title, $html));
}
diff --git a/core/modules/system/tests/modules/common_test/common_test.module b/core/modules/system/tests/modules/common_test/common_test.module
index c463f20474b0..5c3585619286 100644
--- a/core/modules/system/tests/modules/common_test/common_test.module
+++ b/core/modules/system/tests/modules/common_test/common_test.module
@@ -5,6 +5,8 @@
* Helper module for the Common tests.
*/
+use \Drupal\Core\Asset\AttachedAssetsInterface;
+
/**
* Applies #printed to an element to help test #pre_render.
*/
@@ -347,7 +349,7 @@ function common_test_page_attachments_alter(array &$page) {
*
* @see \Drupal\system\Tests\Common\JavaScriptTest::testHeaderSetting()
*/
-function common_test_js_settings_alter(&$settings) {
+function common_test_js_settings_alter(&$settings, AttachedAssetsInterface $assets) {
// Modify an existing setting.
if (array_key_exists('pluralDelimiter', $settings['locale'])) {
$settings['locale']['pluralDelimiter'] = '☃';
diff --git a/core/modules/system/theme.api.php b/core/modules/system/theme.api.php
index 82e9e096d73e..0ed5728bfcfb 100644
--- a/core/modules/system/theme.api.php
+++ b/core/modules/system/theme.api.php
@@ -711,12 +711,13 @@ function hook_element_info_alter(array &$types) {
*
* @param $javascript
* An array of all JavaScript being presented on the page.
+ * @param \Drupal\Core\Asset\AttachedAssetsInterface $assets
+ * The assets attached to the current response.
*
- * @see _drupal_add_js()
- * @see drupal_get_js()
* @see drupal_js_defaults()
+ * @see \Drupal\Core\Asset\AssetResolver
*/
-function hook_js_alter(&$javascript) {
+function hook_js_alter(&$javascript, \Drupal\Core\Asset\AttachedAssetsInterface $assets) {
// Swap out jQuery to use an updated version of the library.
$javascript['core/assets/vendor/jquery/jquery.min.js']['data'] = drupal_get_path('module', 'jquery_update') . '/jquery.js';
}
@@ -791,12 +792,12 @@ function hook_library_info_build() {
* @param array &$settings
* An array of all JavaScript settings (drupalSettings) being presented on the
* page.
+ * @param \Drupal\Core\Asset\AttachedAssetsInterface $assets
+ * The assets attached to the current response.
*
- * @see _drupal_add_js()
- * @see drupal_get_js()
- * @see drupal_js_defaults()
+ * @see \Drupal\Core\Asset\AssetResolver
*/
-function hook_js_settings_alter(array &$settings) {
+function hook_js_settings_alter(array &$settings, \Drupal\Core\Asset\AttachedAssetsInterface $assets) {
// Add settings.
$settings['user']['uid'] = \Drupal::currentUser();
@@ -856,11 +857,12 @@ function hook_library_info_alter(&$libraries, $module) {
*
* @param $css
* An array of all CSS items (files and inline CSS) being requested on the page.
+ * @param \Drupal\Core\Asset\AttachedAssetsInterface $assets
+ * The assets attached to the current response.
*
- * @see _drupal_add_css()
- * @see drupal_get_css()
+ * @see Drupal\Core\Asset\LibraryResolverInterface::getCssAssets()
*/
-function hook_css_alter(&$css) {
+function hook_css_alter(&$css, \Drupal\Core\Asset\AttachedAssetsInterface $assets) {
// Remove defaults.css file.
unset($css[drupal_get_path('module', 'system') . '/defaults.css']);
}
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index d241b922fcf9..86c063d436f8 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -3,6 +3,7 @@
use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Asset\AttachedAssetsInterface;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
use Drupal\Core\Field\BaseFieldDefinition;
use Drupal\Core\Form\FormStateInterface;
@@ -104,7 +105,7 @@ function user_theme() {
/**
* Implements hook_js_settings_alter().
*/
-function user_js_settings_alter(&$settings) {
+function user_js_settings_alter(&$settings, AttachedAssetsInterface $assets) {
// Provide the user ID in drupalSettings to allow JavaScript code to customize
// the experience for the end user, rather than the server side, which would
// break the render cache.
diff --git a/core/modules/views/src/Controller/ViewAjaxController.php b/core/modules/views/src/Controller/ViewAjaxController.php
index 401b0f96f1a5..e938ef81b623 100644
--- a/core/modules/views/src/Controller/ViewAjaxController.php
+++ b/core/modules/views/src/Controller/ViewAjaxController.php
@@ -8,9 +8,11 @@
namespace Drupal\views\Controller;
use Drupal\Component\Utility\UrlHelper;
+use Drupal\Core\Ajax\AjaxResponse;
use Drupal\Core\Ajax\ReplaceCommand;
use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Render\RendererInterface;
use Drupal\views\Ajax\ScrollTopCommand;
use Drupal\views\Ajax\ViewAjaxResponse;
use Drupal\views\ViewExecutableFactory;
@@ -38,6 +40,13 @@ class ViewAjaxController implements ContainerInjectionInterface {
*/
protected $executableFactory;
+ /**
+ * The renderer.
+ *
+ * @var \Drupal\Core\Render\RendererInterface
+ */
+ protected $renderer;
+
/**
* Constructs a ViewAjaxController object.
*
@@ -45,10 +54,13 @@ class ViewAjaxController implements ContainerInjectionInterface {
* The entity storage for views.
* @param \Drupal\views\ViewExecutableFactory $executable_factory
* The factory to load a view executable with.
+ * @param \Drupal\Core\Render\RendererInterface $renderer
+ * The renderer.
*/
- public function __construct(EntityStorageInterface $storage, ViewExecutableFactory $executable_factory) {
+ public function __construct(EntityStorageInterface $storage, ViewExecutableFactory $executable_factory, RendererInterface $renderer) {
$this->storage = $storage;
$this->executableFactory = $executable_factory;
+ $this->renderer = $renderer;
}
/**
@@ -57,7 +69,8 @@ public function __construct(EntityStorageInterface $storage, ViewExecutableFacto
public static function create(ContainerInterface $container) {
return new static(
$container->get('entity.manager')->getStorage('view'),
- $container->get('views.executable')
+ $container->get('views.executable'),
+ $container->get('renderer')
);
}
@@ -96,7 +109,7 @@ public function ajaxView(Request $request) {
// Remove all of this stuff from the query of the request so it doesn't
// end up in pagers and tablesort URLs.
- foreach (array('view_name', 'view_display_id', 'view_args', 'view_path', 'view_dom_id', 'pager_element', 'view_base_path', 'ajax_html_ids', 'ajax_page_state') as $key) {
+ foreach (array('view_name', 'view_display_id', 'view_args', 'view_path', 'view_dom_id', 'pager_element', 'view_base_path', 'ajax_html_ids') as $key) {
$request->query->remove($key);
$request->request->remove($key);
}
@@ -138,7 +151,8 @@ public function ajaxView(Request $request) {
$view->dom_id = $dom_id;
if ($preview = $view->preview($display_id, $args)) {
- $response->addCommand(new ReplaceCommand(".view-dom-id-$dom_id", $this->drupalRender($preview)));
+ $response->addCommand(new ReplaceCommand(".view-dom-id-$dom_id", $this->renderer->render($preview)));
+ $response->setAttachments($preview['#attached']);
}
return $response;
}
@@ -151,22 +165,4 @@ public function ajaxView(Request $request) {
}
}
- /**
- * Wraps drupal_render.
- *
- * @param array $elements
- * The structured array describing the data to be rendered.
- *
- * @return string
- * The rendered HTML.
- *
- * @todo Remove once drupal_render is converted to autoloadable code.
- * @see https://drupal.org/node/2171071
- */
- protected function drupalRender(array $elements) {
- $output = drupal_render($elements);
- drupal_process_attached($elements);
- return $output;
- }
-
}
diff --git a/core/modules/views/src/Tests/ViewAjaxTest.php b/core/modules/views/src/Tests/ViewAjaxTest.php
index 0420a0a4d84e..5eb004d4b194 100644
--- a/core/modules/views/src/Tests/ViewAjaxTest.php
+++ b/core/modules/views/src/Tests/ViewAjaxTest.php
@@ -50,7 +50,8 @@ public function testAjaxView() {
'view_name' => 'test_ajax_view',
'view_display_id' => 'page_1',
);
- $response = $this->drupalPost('views/ajax', 'application/json', $post);
+ $post += $this->getAjaxPageStatePostData();
+ $response = $this->drupalPost('views/ajax', 'application/vnd.drupal-ajax', $post);
$data = Json::decode($response);
// Ensure that the view insert command is part of the result.
diff --git a/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php b/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
index 996ac1a40f90..7e09cb49ae5f 100644
--- a/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
+++ b/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
@@ -45,8 +45,15 @@ protected function setUp() {
$this->executableFactory = $this->getMockBuilder('Drupal\views\ViewExecutableFactory')
->disableOriginalConstructor()
->getMock();
-
- $this->viewAjaxController = new TestViewAjaxController($this->viewStorage, $this->executableFactory);
+ $this->renderer = $this->getMock('\Drupal\Core\Render\RendererInterface');
+ $this->renderer->expects($this->any())
+ ->method('render')
+ ->will($this->returnCallback(function(array &$elements) {
+ $elements['#attached'] = [];
+ return isset($elements['#markup']) ? $elements['#markup'] : '';
+ }));
+
+ $this->viewAjaxController = new ViewAjaxController($this->viewStorage, $this->executableFactory, $this->renderer);
}
/**
@@ -289,18 +296,6 @@ protected function assertViewResultCommand(ViewAjaxResponse $response, $position
}
-/**
- * Overrides ViewAjaxController::drupalRender to protect the parent method.
- */
-class TestViewAjaxController extends ViewAjaxController {
-
- // @todo Remove once drupal_render is converted to autoloadable code.
- protected function drupalRender(array $elements) {
- return isset($elements['#markup']) ? $elements['#markup'] : '';
- }
-
-}
-
}
namespace {
diff --git a/core/modules/views_ui/src/Form/Ajax/ViewsFormBase.php b/core/modules/views_ui/src/Form/Ajax/ViewsFormBase.php
index de3890b255d7..6dd609e3c876 100644
--- a/core/modules/views_ui/src/Form/Ajax/ViewsFormBase.php
+++ b/core/modules/views_ui/src/Form/Ajax/ViewsFormBase.php
@@ -119,14 +119,6 @@ public function getForm(ViewEntityInterface $view, $display_id, $js) {
unset($view->form_cache);
}
- // With the below logic, we may end up rendering a form twice (or two forms
- // each sharing the same element ids), potentially resulting in
- // _drupal_add_js() being called twice to add the same setting. drupal_get_js()
- // is ok with that, but until \Drupal\Core\Ajax\AjaxResponse::ajaxRender()
- // is (http://drupal.org/node/208611), reset the _drupal_add_js() static
- // before rendering the second time.
- $drupal_add_js_original = _drupal_add_js();
- $drupal_add_js = &drupal_static('_drupal_add_js');
$form_class = get_class($form_state->getFormObject());
$response = $this->ajaxFormWrapper($form_class, $form_state);
@@ -137,7 +129,6 @@ public function getForm(ViewEntityInterface $view, $display_id, $js) {
// Sometimes we need to re-generate the form for multi-step type operations.
if (!empty($view->stack)) {
- $drupal_add_js = $drupal_add_js_original;
$stack = $view->stack;
$top = array_shift($stack);
@@ -223,6 +214,11 @@ protected function ajaxFormWrapper($form_class, FormStateInterface &$form_state)
// Ajax command list to execute.
$response = new AjaxResponse();
+ // Attach the library necessary for using the OpenModalDialogCommand and
+ // set the attachments for this Ajax response.
+ $form['#attached']['library'][] = 'core/drupal.dialog.ajax';
+ $response->setAttachments($form['#attached']);
+
$display = '';
$status_messages = array('#theme' => 'status_messages');
if ($messages = drupal_render($status_messages)) {
diff --git a/core/modules/views_ui/src/Tests/RowUITest.php b/core/modules/views_ui/src/Tests/RowUITest.php
index 67e415d3ee7d..eceb3bf9a414 100644
--- a/core/modules/views_ui/src/Tests/RowUITest.php
+++ b/core/modules/views_ui/src/Tests/RowUITest.php
@@ -60,8 +60,20 @@ public function testRowUI() {
$this->assertEqual($row['options']['test_option'], $random_name, 'Make sure that the custom settings field got saved as expected.');
// Change the row plugin to fields using ajax.
- $this->drupalPostAjaxForm($row_plugin_url, array('row[type]' => 'fields'), array('op' => 'Apply'), str_replace('/nojs/', '/ajax/', $row_plugin_url));
- $this->drupalPostAjaxForm(NULL, array(), array('op' => 'Apply'), str_replace('/nojs/', '/ajax/', $row_plugin_url));
+ // Note: this is the best approximation we can achieve, because we cannot
+ // simulate the 'openDialog' command in
+ // WebTestBase::drupalProcessAjaxResponse(), hence we have to make do.
+ $row_plugin_url_ajax = str_replace('/nojs/', '/ajax/', $row_plugin_url);
+ $ajax_settings = [
+ 'accepts' => 'application/vnd.drupal-ajax',
+ 'submit' => [
+ '_triggering_element_name' => 'op',
+ '_triggering_element_value' => 'Apply',
+ ],
+ 'url' => $row_plugin_url_ajax,
+ ];
+ $this->drupalPostAjaxForm($row_plugin_url, ['row[type]' => 'fields'], NULL, $row_plugin_url_ajax, [], [], NULL, $ajax_settings);
+ $this->drupalGet($row_plugin_url);
$this->assertResponse(200);
$this->assertFieldByName('row[type]', 'fields', 'Make sure that the fields got saved as used row plugin.');
}
diff --git a/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php b/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php
new file mode 100644
index 000000000000..e10adce0b39c
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php
@@ -0,0 +1,177 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Asset\LibraryDependencyResolverTest.
+ */
+
+namespace Drupal\Tests\Core\Asset;
+
+use Drupal\Core\Asset\LibraryDependencyResolver;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Asset\LibraryDependencyResolver
+ * @group Asset
+ */
+class LibraryDependencyResolverTest extends UnitTestCase {
+
+ /**
+ * The tested library dependency resolver.
+ *
+ * @var \Drupal\Core\Asset\LibraryDependencyResolver
+ */
+ protected $libraryDependencyResolver;
+
+ /**
+ * The mocked library discovery service.
+ *
+ * @var \Drupal\Core\Asset\LibraryDiscoveryInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $libraryDiscovery;
+
+ /**
+ * The mocked module handler.
+ *
+ * @var \Drupal\Core\Extension\ModuleHandlerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $moduleHandler;
+
+ /**
+ * Test library data.
+ *
+ * @var array
+ */
+ protected $libraryData = array(
+ 'no_deps_a' => ['js' => [], 'css' => []],
+ 'no_deps_b' => ['js' => [], 'css' => []],
+ 'no_deps_c' => ['js' => [], 'css' => []],
+ 'deps_a' => ['js' => [], 'css' => [], 'dependencies' => ['test/no_deps_a']],
+ 'deps_b' => ['js' => [], 'css' => [], 'dependencies' => ['test/no_deps_a', 'test/no_deps_b']],
+ 'deps_c' => ['js' => [], 'css' => [], 'dependencies' => ['test/no_deps_b', 'test/no_deps_a']],
+ 'nested_deps_a' => ['js' => [], 'css' => [], 'dependencies' => ['test/deps_a']],
+ 'nested_deps_b' => ['js' => [], 'css' => [], 'dependencies' => ['test/nested_deps_a']],
+ 'nested_deps_c' => ['js' => [], 'css' => [], 'dependencies' => ['test/nested_deps_b']],
+ );
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ $this->libraryDiscovery = $this->getMockBuilder('Drupal\Core\Asset\LibraryDiscovery')
+ ->disableOriginalConstructor()
+ ->setMethods(['getLibrariesByExtension'])
+ ->getMock();
+ $this->libraryDiscovery->expects($this->any())
+ ->method('getLibrariesByExtension')
+ ->with('test')
+ ->will($this->returnValue($this->libraryData));
+ $this->libraryDependencyResolver= new LibraryDependencyResolver($this->libraryDiscovery);
+ }
+
+
+ /**
+ * Provides test data for ::testGetLibrariesWithDependencies().
+ */
+ public function providerTestGetLibrariesWithDependencies() {
+ return [
+ // Empty list of libraries.
+ [[], []],
+ // Without dependencies.
+ [['test/no_deps_a'], ['test/no_deps_a']],
+ [['test/no_deps_a', 'test/no_deps_b'], ['test/no_deps_a', 'test/no_deps_b']],
+ [['test/no_deps_b', 'test/no_deps_a'], ['test/no_deps_b', 'test/no_deps_a']],
+ // Single-level (direct) dependencies.
+ [['test/deps_a'], ['test/no_deps_a', 'test/deps_a']],
+ [['test/deps_b'], ['test/no_deps_a', 'test/no_deps_b', 'test/deps_b']],
+ [['test/deps_c'], ['test/no_deps_b', 'test/no_deps_a', 'test/deps_c']],
+ [['test/deps_a', 'test/deps_b'], ['test/no_deps_a', 'test/deps_a', 'test/no_deps_b', 'test/deps_b']],
+ [['test/deps_a', 'test/deps_c'], ['test/no_deps_a', 'test/deps_a', 'test/no_deps_b', 'test/deps_c']],
+ [['test/deps_a', 'test/deps_b', 'test/deps_c'], ['test/no_deps_a', 'test/deps_a', 'test/no_deps_b', 'test/deps_b', 'test/deps_c']],
+ [['test/deps_b', 'test/deps_a'], ['test/no_deps_a', 'test/no_deps_b', 'test/deps_b', 'test/deps_a']],
+ [['test/deps_b', 'test/deps_c'], ['test/no_deps_a', 'test/no_deps_b', 'test/deps_b', 'test/deps_c']],
+ [['test/deps_c', 'test/deps_b'], ['test/no_deps_b', 'test/no_deps_a', 'test/deps_c', 'test/deps_b']],
+ // Multi-level (indirect) dependencies.
+ [['test/nested_deps_a'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a']],
+ [['test/nested_deps_b'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b']],
+ [['test/nested_deps_c'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']],
+ [['test/nested_deps_a', 'test/nested_deps_b'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b']],
+ [['test/nested_deps_b', 'test/nested_deps_a'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b']],
+ [['test/nested_deps_a', 'test/nested_deps_c'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']],
+ [['test/nested_deps_b', 'test/nested_deps_c'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']],
+ [['test/nested_deps_c', 'test/nested_deps_a'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']],
+ [['test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']],
+ [['test/nested_deps_a', 'test/nested_deps_c', 'test/nested_deps_b'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']],
+ [['test/nested_deps_b', 'test/nested_deps_a', 'test/nested_deps_c'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']],
+ [['test/nested_deps_b', 'test/nested_deps_c', 'test/nested_deps_a'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']],
+ [['test/nested_deps_c', 'test/nested_deps_a', 'test/nested_deps_b'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']],
+ [['test/nested_deps_c', 'test/nested_deps_b', 'test/nested_deps_a'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']],
+ // Complex dependencies, combining the above, with many intersections.
+ [['test/deps_c', 'test/nested_deps_b'], ['test/no_deps_b', 'test/no_deps_a', 'test/deps_c', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b']],
+ [['test/no_deps_a', 'test/deps_c', 'test/nested_deps_b'], ['test/no_deps_a', 'test/no_deps_b', 'test/deps_c', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b']],
+ [['test/nested_deps_b', 'test/deps_c', 'test/no_deps_c'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/no_deps_b', 'test/deps_c', 'test/no_deps_c']],
+ ];
+ }
+
+ /**
+ * @covers ::getLibrariesWithDependencies()
+ *
+ * @dataProvider providerTestGetLibrariesWithDependencies
+ */
+ public function testGetLibrariesWithDependencies(array $libraries, array $expected) {
+ $this->assertEquals($expected, $this->libraryDependencyResolver->getLibrariesWithDependencies($libraries));
+ }
+
+ /**
+ * Provides test data for ::testGetMinimalRepresentativeSubset().
+ */
+ public function providerTestGetMinimalRepresentativeSubset() {
+ return [
+ // Empty list of libraries.
+ [[], []],
+ // Without dependencies.
+ [['test/no_deps_a'], ['test/no_deps_a']],
+ [['test/no_deps_a', 'test/no_deps_b'], ['test/no_deps_a', 'test/no_deps_b']],
+ [['test/no_deps_b', 'test/no_deps_a'], ['test/no_deps_b', 'test/no_deps_a']],
+ // Single-level (direct) dependencies.
+ [['test/deps_a'], ['test/deps_a']],
+ [['test/deps_b'], ['test/deps_b']],
+ [['test/deps_c'], ['test/deps_c']],
+ [['test/deps_a', 'test/deps_b'], ['test/deps_a', 'test/deps_b']],
+ [['test/deps_a', 'test/deps_c'], ['test/deps_a', 'test/deps_c']],
+ [['test/deps_a', 'test/deps_b', 'test/deps_c'], ['test/deps_a', 'test/deps_b', 'test/deps_c']],
+ [['test/deps_b', 'test/deps_a'], ['test/deps_b', 'test/deps_a']],
+ [['test/deps_b', 'test/deps_c'], ['test/deps_b', 'test/deps_c']],
+ [['test/deps_c', 'test/deps_b'], ['test/deps_c', 'test/deps_b']],
+ // Multi-level (indirect) dependencies.
+ [['test/nested_deps_a'], ['test/nested_deps_a']],
+ [['test/nested_deps_b'], ['test/nested_deps_b']],
+ [['test/nested_deps_c'], ['test/nested_deps_c']],
+ [['test/nested_deps_a', 'test/nested_deps_b'], ['test/nested_deps_b']],
+ [['test/nested_deps_b', 'test/nested_deps_a'], ['test/nested_deps_b']],
+ [['test/nested_deps_a', 'test/nested_deps_c'], ['test/nested_deps_c']],
+ [['test/nested_deps_b', 'test/nested_deps_c'], ['test/nested_deps_c']],
+ [['test/nested_deps_c', 'test/nested_deps_a'], ['test/nested_deps_c']],
+ [['test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c'], ['test/nested_deps_c']],
+ [['test/nested_deps_a', 'test/nested_deps_c', 'test/nested_deps_b'], ['test/nested_deps_c']],
+ [['test/nested_deps_b', 'test/nested_deps_a', 'test/nested_deps_c'], ['test/nested_deps_c']],
+ [['test/nested_deps_b', 'test/nested_deps_c', 'test/nested_deps_a'], ['test/nested_deps_c']],
+ [['test/nested_deps_c', 'test/nested_deps_a', 'test/nested_deps_b'], ['test/nested_deps_c']],
+ [['test/nested_deps_c', 'test/nested_deps_b', 'test/nested_deps_a'], ['test/nested_deps_c']],
+ // Complex dependencies, combining the above, with many intersections.
+ [['test/deps_c', 'test/nested_deps_b'], ['test/deps_c', 'test/nested_deps_b']],
+ [['test/no_deps_a', 'test/deps_c', 'test/nested_deps_b'], ['test/deps_c', 'test/nested_deps_b']],
+ [['test/nested_deps_b', 'test/deps_c', 'test/no_deps_c'], ['test/nested_deps_b', 'test/deps_c', 'test/no_deps_c']],
+ ];
+ }
+
+ /**
+ * @covers ::getMinimalRepresentativeSubset()
+ *
+ * @dataProvider providerTestGetMinimalRepresentativeSubset
+ */
+ public function testGetMinimalRepresentativeSubset(array $libraries, array $expected) {
+ $this->assertEquals($expected, $this->libraryDependencyResolver->getMinimalRepresentativeSubset($libraries));
+ }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Controller/AjaxRendererTest.php b/core/tests/Drupal/Tests/Core/Controller/AjaxRendererTest.php
index bb5b823b54cc..bac29641794d 100644
--- a/core/tests/Drupal/Tests/Core/Controller/AjaxRendererTest.php
+++ b/core/tests/Drupal/Tests/Core/Controller/AjaxRendererTest.php
@@ -70,6 +70,7 @@ class TestAjaxRenderer extends AjaxRenderer {
* {@inheritdoc}
*/
protected function drupalRenderRoot(&$elements, $is_root_call = FALSE) {
+ $elements += ['#attached' => []];
if (isset($elements['#markup'])) {
return $elements['#markup'];
}
--
GitLab