|
|
|
@ -14,6 +14,7 @@ use yii\helpers\Console; |
|
|
|
use yii\helpers\FileHelper; |
|
|
|
use yii\helpers\FileHelper; |
|
|
|
use yii\helpers\VarDumper; |
|
|
|
use yii\helpers\VarDumper; |
|
|
|
use yii\web\AssetBundle; |
|
|
|
use yii\web\AssetBundle; |
|
|
|
|
|
|
|
use yii\web\AssetManager; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* Allows you to combine and compress your JavaScript and CSS files. |
|
|
|
* Allows you to combine and compress your JavaScript and CSS files. |
|
|
|
@ -37,7 +38,7 @@ use yii\web\AssetBundle; |
|
|
|
* Note: by default this command relies on an external tools to perform actual files compression, |
|
|
|
* Note: by default this command relies on an external tools to perform actual files compression, |
|
|
|
* check [[jsCompressor]] and [[cssCompressor]] for more details. |
|
|
|
* check [[jsCompressor]] and [[cssCompressor]] for more details. |
|
|
|
* |
|
|
|
* |
|
|
|
* @property \yii\web\AssetManager $assetManager Asset manager instance. Note that the type of this property |
|
|
|
* @property AssetManager $assetManager Asset manager instance. Note that the type of this property |
|
|
|
* differs in getter and setter. See [[getAssetManager()]] and [[setAssetManager()]] for details. |
|
|
|
* differs in getter and setter. See [[getAssetManager()]] and [[setAssetManager()]] for details. |
|
|
|
* |
|
|
|
* |
|
|
|
* @author Qiang Xue <qiang.xue@gmail.com> |
|
|
|
* @author Qiang Xue <qiang.xue@gmail.com> |
|
|
|
@ -80,8 +81,8 @@ class AssetController extends Controller |
|
|
|
* 'css' => 'css/all-shared-{hash}.css', |
|
|
|
* 'css' => 'css/all-shared-{hash}.css', |
|
|
|
* 'depends' => [ |
|
|
|
* 'depends' => [ |
|
|
|
* // Include all assets shared between 'backend' and 'frontend' |
|
|
|
* // Include all assets shared between 'backend' and 'frontend' |
|
|
|
* 'yii\web\YiiAsset', |
|
|
|
* \yii\web\YiiAsset::class, |
|
|
|
* 'app\assets\SharedAsset', |
|
|
|
* \app\assets\SharedAsset::class, |
|
|
|
* ], |
|
|
|
* ], |
|
|
|
* ], |
|
|
|
* ], |
|
|
|
* 'allBackEnd' => [ |
|
|
|
* 'allBackEnd' => [ |
|
|
|
@ -89,7 +90,7 @@ class AssetController extends Controller |
|
|
|
* 'css' => 'css/all-{hash}.css', |
|
|
|
* 'css' => 'css/all-{hash}.css', |
|
|
|
* 'depends' => [ |
|
|
|
* 'depends' => [ |
|
|
|
* // Include only 'backend' assets: |
|
|
|
* // Include only 'backend' assets: |
|
|
|
* 'app\assets\AdminAsset' |
|
|
|
* \app\assets\AdminAsset::class |
|
|
|
* ], |
|
|
|
* ], |
|
|
|
* ], |
|
|
|
* ], |
|
|
|
* 'allFrontEnd' => [ |
|
|
|
* 'allFrontEnd' => [ |
|
|
|
@ -122,7 +123,7 @@ class AssetController extends Controller |
|
|
|
public $cssCompressor = 'java -jar yuicompressor.jar --type css {from} -o {to}'; |
|
|
|
public $cssCompressor = 'java -jar yuicompressor.jar --type css {from} -o {to}'; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* @var array|\yii\web\AssetManager [[\yii\web\AssetManager]] instance or its array configuration, which will be used |
|
|
|
* @var array|AssetManager [[AssetManager]] instance or its array configuration, which will be used |
|
|
|
* for assets processing. |
|
|
|
* for assets processing. |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
private $_assetManager = []; |
|
|
|
private $_assetManager = []; |
|
|
|
@ -137,8 +138,8 @@ class AssetController extends Controller |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (!is_object($this->_assetManager)) { |
|
|
|
if (!is_object($this->_assetManager)) { |
|
|
|
$options = $this->_assetManager; |
|
|
|
$options = $this->_assetManager; |
|
|
|
if (!isset($options['class'])) { |
|
|
|
if (empty($options['class'])) { |
|
|
|
$options['class'] = 'yii\\web\\AssetManager'; |
|
|
|
$options['class'] = AssetManager::class; |
|
|
|
} |
|
|
|
} |
|
|
|
if (!isset($options['basePath'])) { |
|
|
|
if (!isset($options['basePath'])) { |
|
|
|
throw new Exception("Please specify 'basePath' for the 'assetManager' option."); |
|
|
|
throw new Exception("Please specify 'basePath' for the 'assetManager' option."); |
|
|
|
@ -154,8 +155,8 @@ class AssetController extends Controller |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* Sets asset manager instance or configuration. |
|
|
|
* Sets asset manager instance or configuration. |
|
|
|
* @param \yii\web\AssetManager|array $assetManager asset manager instance or its array configuration. |
|
|
|
* @param AssetManager|array $assetManager asset manager instance or its array configuration. |
|
|
|
* @throws \yii\console\Exception on invalid argument type. |
|
|
|
* @throws Exception on invalid argument type. |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public function setAssetManager($assetManager) |
|
|
|
public function setAssetManager($assetManager) |
|
|
|
{ |
|
|
|
{ |
|
|
|
@ -403,7 +404,7 @@ class AssetController extends Controller |
|
|
|
$depends[] = $target; |
|
|
|
$depends[] = $target; |
|
|
|
} |
|
|
|
} |
|
|
|
$targets[$bundle] = Yii::createObject([ |
|
|
|
$targets[$bundle] = Yii::createObject([ |
|
|
|
'class' => strpos($bundle, '\\') !== false ? $bundle : 'yii\\web\\AssetBundle', |
|
|
|
'class' => strpos($bundle, '\\') !== false ? $bundle : AssetBundle::class, |
|
|
|
'depends' => $depends, |
|
|
|
'depends' => $depends, |
|
|
|
]); |
|
|
|
]); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -686,8 +687,8 @@ return [ |
|
|
|
// The list of asset bundles to compress: |
|
|
|
// The list of asset bundles to compress: |
|
|
|
'bundles' => [ |
|
|
|
'bundles' => [ |
|
|
|
// 'app\assets\AppAsset', |
|
|
|
// 'app\assets\AppAsset', |
|
|
|
// 'yii\web\YiiAsset', |
|
|
|
// \yii\web\YiiAsset::class, |
|
|
|
// 'yii\web\JqueryAsset', |
|
|
|
// \yii\web\JqueryAsset::class, |
|
|
|
], |
|
|
|
], |
|
|
|
// Asset bundle for compression output: |
|
|
|
// Asset bundle for compression output: |
|
|
|
'targets' => [ |
|
|
|
'targets' => [ |
|
|
|
|
Carsten Brandt
8 years ago