Skip to content

Y
yii2
Commit f4e3edb1 by Qiang Xue
Options

Fixes #1004.

parent 3cd897e5
Showing with 10 additions and 2 deletions
framework/yii/web/AssetBundle.php
...@@ -139,10 +139,18 @@ class AssetBundle extends Object ...@@ -139,10 +139,18 @@ class AssetBundle extends Object
public function registerAssets($view) public function registerAssets($view)
{ {
foreach ($this->js as $js) { foreach ($this->js as $js) {
$view->registerJsFile($this->baseUrl . '/' . ltrim($js, '/'), $this->jsOptions); if ($js[0] === '/') {
$view->registerJsFile($this->baseUrl . $js, $this->jsOptions);
} else {
$view->registerJsFile($this->baseUrl . '/' . $js, $this->jsOptions);
}
} }
foreach ($this->css as $css) { foreach ($this->css as $css) {
$view->registerCssFile($this->baseUrl . '/' . ltrim($css, '/'), $this->cssOptions); if ($css[0] === '/') {
$view->registerCssFile($this->baseUrl . $css, $this->cssOptions);
} else {
$view->registerCssFile($this->baseUrl . '/' . $css, $this->cssOptions);
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment