php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-03 22:32:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

turn asset manager into a getter.

Browse Source
This commit is contained in:
Qiang Xue
2013-04-18 18:59:27 -04:00
parent 90b2a54f2d
commit c32def8618
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
framework/base/ViewContent.php
View File

@ -24,11 +24,6 @@ class ViewContent extends Component
const TOKEN_BODY_BEGIN = '<![CDATA[YII-BLOCK-BODY-BEGIN]]>'; const TOKEN_BODY_BEGIN = '<![CDATA[YII-BLOCK-BODY-BEGIN]]>';
const TOKEN_BODY_END = '<![CDATA[YII-BLOCK-BODY-END]]>'; const TOKEN_BODY_END = '<![CDATA[YII-BLOCK-BODY-END]]>';
/**
* @var \yii\web\AssetManager
*/
public $assetManager;
public $assetBundles; public $assetBundles;
public $title; public $title;
public $metaTags; public $metaTags;
@ -42,14 +37,6 @@ class ViewContent extends Component
public $jsInBody; public $jsInBody;
public $jsFilesInBody; public $jsFilesInBody;
public function init()
{
parent::init();
if ($this->assetManager === null) {
$this->assetManager = Yii::$app->getAssets();
}
}
public function reset() public function reset()
{ {
$this->title = null; $this->title = null;
@ -64,6 +51,21 @@ class ViewContent extends Component
$this->jsInBody = null; $this->jsInBody = null;
$this->jsFilesInBody = null; $this->jsFilesInBody = null;
} }
private $_assetManager;
/**
* @return \yii\web\AssetManager
*/
public function getAssetManager()
{
return $this->_assetManager ?: Yii::$app->getAssets();
}
public function setAssetManager($value)
{
$this->_assetManager = $value;
}
public function begin() public function begin()
{ {
@ -95,10 +97,11 @@ class ViewContent extends Component
public function registerAssetBundle($name) public function registerAssetBundle($name)
{ {
if (!isset($this->assetBundles[$name])) { if (!isset($this->assetBundles[$name])) {
$bundle = $this->assetManager->getBundle($name); $am = $this->getAssetManager();
$bundle = $am->getBundle($name);
if ($bundle !== null) { if ($bundle !== null) {
$this->assetBundles[$name] = false; $this->assetBundles[$name] = false;
$bundle->registerAssets($this, $this->assetManager); $bundle->registerAssets($this, $am);
$this->assetBundles[$name] = true; $this->assetBundles[$name] = true;
} else { } else {
throw new InvalidConfigException("Unknown asset bundle: $name"); throw new InvalidConfigException("Unknown asset bundle: $name");