php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-19 16:01:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added $publish parameter to AssetManager::getBundle().

Browse Source
This commit is contained in:
Qiang Xue
2013-10-20 10:31:06 -04:00
parent 1475b46249
commit b03b38fb0d
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/yii/base/View.php
View File

@@ -552,7 +552,7 @@ class View extends Component
foreach($bundle->depends as $dep) { foreach($bundle->depends as $dep) {
$this->registerAssetFiles($dep); $this->registerAssetFiles($dep);
} }
$bundle->registerAssets($this); $bundle->registerAssetFiles($this);
unset($this->assetBundles[$name]); unset($this->assetBundles[$name]);
} }

2
framework/yii/web/AssetBundle.php
View File

@@ -133,7 +133,7 @@ class AssetBundle extends Object
* Registers the CSS and JS files with the given view. * Registers the CSS and JS files with the given view.
* @param \yii\base\View $view the view that the asset files are to be registered with. * @param \yii\base\View $view the view that the asset files are to be registered with.
*/ */
public function registerAssets($view) public function registerAssetFiles($view)
{ {
foreach ($this->js as $js) { foreach ($this->js as $js) {
if (strpos($js, '/') !== 0 && strpos($js, '://') === false) { if (strpos($js, '/') !== 0 && strpos($js, '://') === false) {

6
framework/yii/web/AssetManager.php
View File

@@ -95,10 +95,12 @@ class AssetManager extends Component
* it will treat `$name` as the class of the asset bundle and create a new instance of it. * it will treat `$name` as the class of the asset bundle and create a new instance of it.
* *
* @param string $name the class name of the asset bundle * @param string $name the class name of the asset bundle
* @param boolean $publish whether to publish the asset files in the asset bundle before it is returned.
* If you set this false, you must manually call `AssetBundle::publish()` to publish the asset files.
* @return AssetBundle the asset bundle instance * @return AssetBundle the asset bundle instance
* @throws InvalidConfigException if $name does not refer to a valid asset bundle * @throws InvalidConfigException if $name does not refer to a valid asset bundle
*/ */
public function getBundle($name) public function getBundle($name, $publish = true)
{ {
if (isset($this->bundles[$name])) { if (isset($this->bundles[$name])) {
if ($this->bundles[$name] instanceof AssetBundle) { if ($this->bundles[$name] instanceof AssetBundle) {
@@ -111,8 +113,10 @@ class AssetManager extends Component
} else { } else {
$bundle = Yii::createObject($name); $bundle = Yii::createObject($name);
} }
if ($publish) {
/** @var AssetBundle $bundle */ /** @var AssetBundle $bundle */
$bundle->publish($this); $bundle->publish($this);
}
return $this->bundles[$name] = $bundle; return $this->bundles[$name] = $bundle;
} }