core/lib/Drupal/Core/Asset/AssetBag.php | 19 ++++++++++--------- core/lib/Drupal/Core/Asset/AssetBagInterface.php | 17 ++++++++--------- core/lib/Drupal/Core/Asset/AssetInterface.php | 3 ++- core/lib/Drupal/Core/Asset/AssetLibrary.php | 4 ++-- core/lib/Drupal/Core/Asset/AssetLibraryManager.php | 3 ++- .../lib/Drupal/Core/Asset/AssetLibraryReference.php | 4 ++-- core/lib/Drupal/Core/Asset/BaseAsset.php | 4 ++-- core/lib/Drupal/Core/Asset/BaseExternalAsset.php | 4 ++-- core/lib/Drupal/Core/Asset/BaseFileAsset.php | 4 ++-- core/lib/Drupal/Core/Asset/BaseStringAsset.php | 4 ++-- .../Drupal/Core/Asset/JavascriptAssetInterface.php | 5 +++-- .../Drupal/Core/Asset/JavascriptExternalAsset.php | 7 +++++-- core/lib/Drupal/Core/Asset/JavascriptFileAsset.php | 7 +++++-- .../lib/Drupal/Core/Asset/JavascriptStringAsset.php | 7 +++++-- .../Drupal/Core/Asset/StylesheetAssetInterface.php | 4 ++-- .../Drupal/Core/Asset/StylesheetExternalAsset.php | 3 ++- core/lib/Drupal/Core/Asset/StylesheetFileAsset.php | 3 ++- .../lib/Drupal/Core/Asset/StylesheetStringAsset.php | 3 ++- 18 files changed, 60 insertions(+), 45 deletions(-) diff --git a/core/lib/Drupal/Core/Asset/AssetBag.php b/core/lib/Drupal/Core/Asset/AssetBag.php index 8bed1d8..61a6bb7 100644 --- a/core/lib/Drupal/Core/Asset/AssetBag.php +++ b/core/lib/Drupal/Core/Asset/AssetBag.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\Core\Asset\AssetBag. + * Contains \Drupal\Core\Asset\AssetBag. */ namespace Drupal\Core\Asset; @@ -15,6 +15,7 @@ * The default AssetBag, used to declare assets needed for a response. */ class AssetBag implements AssetBagInterface { + /** * The container to be used by this AssetBag when accessing services. * @@ -188,15 +189,15 @@ public function all() { /** - * Adds configuration settings for eventual inclusion in Drupal.settings. + * Adds configuration settings for eventual inclusion in drupalSettings. * * @todo decide how to handle these in a fully-classed asset system * * @param $data * An associative array containing configuration settings, to be eventually - * merged into Drupal.settings. Settings should be be wrapped in another + * merged into drupalSettings. Settings should be be wrapped in another * variable, typically by module name, in order to avoid conflicts in the - * Drupal.settings namespace. Items added with a string key will replace + * 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. * @@ -208,7 +209,7 @@ public function addJsSetting($data) { } /** - * Indicates whether this AssetBagInterface contains any Javascript assets. + * Indicates whether this AssetBagInterface contains any JavaScript assets. * * @return bool */ @@ -217,7 +218,7 @@ public function hasJs() { } /** - * Returns the Javascript assets in this bag, fully resolved into page order. + * Returns the JavaScript assets in this bag, fully resolved into page order. * * @todo see if we can make this return an AssetCollection * @@ -230,13 +231,13 @@ public function getJs() { /** - * Returns all Javascript assets contained directly in the bag. + * Returns all JavaScript assets contained directly in the bag. * * Note that this will NOT include assets that have been brought in as part of * dependency declarations. * * @return array - * An array of Javascript assets, ordered by the sequence in which they + * An array of JavaScript assets, ordered by the sequence in which they * entered the bag. */ public function getUnsortedJs() { @@ -253,4 +254,4 @@ public function getUnsortedJs() { public function terminate() { $this->terminated = TRUE; } -} \ No newline at end of file +} diff --git a/core/lib/Drupal/Core/Asset/AssetBagInterface.php b/core/lib/Drupal/Core/Asset/AssetBagInterface.php index 3908a5d..8f0356d 100644 --- a/core/lib/Drupal/Core/Asset/AssetBagInterface.php +++ b/core/lib/Drupal/Core/Asset/AssetBagInterface.php @@ -2,19 +2,18 @@ /** * @file - * Definition of Drupal\Core\Asset\AssetBagInterface. + * Contains \Drupal\Core\Asset\AssetBagInterface. */ namespace Drupal\Core\Asset; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; - use Drupal\Core\Asset\AssetInterface; +use Symfony\Component\DependencyInjection\ContainerAwareInterface; /** * Defines a common interface for asset bags. * - * Asset bags are an mechanism for internal Drupal code to list a set of assets + * Asset bags are a mechanism for internal Drupal code to list a set of assets * and provide some metadata about their manner of use. During a normal page * build, a number of these bags are likely to be built and ultimately merged * onto the Response object. @@ -44,7 +43,7 @@ public function addAssetBag(AssetBagInterface $bag); * * @param $data * An associative array containing configuration settings, to be eventually - * merged into Drupal.settings. Settings should be be wrapped in another + * merged into drupalSettings. Settings should be be wrapped in another * variable, typically by module name, in order to avoid conflicts in the * Drupal.settings namespace. Items added with a string key will replace * existing settings with that key; items with numeric array keys will be @@ -84,14 +83,14 @@ public function getCss(); public function getUnsortedCss(); /** - * Indicates whether this AssetBagInterface contains any Javascript assets. + * Indicates whether this AssetBagInterface contains any JavaScript assets. * * @return bool */ public function hasJs(); /** - * Returns the Javascript assets in this bag, fully resolved into page order. + * Returns the JavaScript assets in this bag, fully resolved into page order. * * @todo see if we can make this return an AssetCollection * @@ -100,13 +99,13 @@ public function hasJs(); public function getJs(); /** - * Returns all Javascript assets contained directly in the bag. + * Returns all JavaScript assets contained directly in the bag. * * Note that this will NOT include assets that have been brought in as part of * dependency declarations. * * @return array - * An array of Javascript assets, ordered by the sequence in which they + * An array of JavaScript assets, ordered by the sequence in which they * entered the bag. */ public function getUnsortedJs(); diff --git a/core/lib/Drupal/Core/Asset/AssetInterface.php b/core/lib/Drupal/Core/Asset/AssetInterface.php index 502a4a4..ebf7381 100644 --- a/core/lib/Drupal/Core/Asset/AssetInterface.php +++ b/core/lib/Drupal/Core/Asset/AssetInterface.php @@ -1,7 +1,8 @@