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

Fixes #2937

Browse Source
This commit is contained in:
Qiang Xue
2014-03-31 23:17:39 -04:00
parent fcd7974fd5
commit a0f9a6d701
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/web/View.php
View File

@@ -10,6 +10,7 @@ namespace yii\web;
use Yii; use Yii;
use yii\helpers\Html; use yii\helpers\Html;
use yii\base\InvalidConfigException; use yii\base\InvalidConfigException;
use yii\helpers\Url;
/** /**
* View represents a view object in the MVC pattern. * View represents a view object in the MVC pattern.
@@ -371,7 +372,7 @@ class View extends \yii\base\View
} else { } else {
$am = Yii::$app->getAssetManager(); $am = Yii::$app->getAssetManager();
$am->bundles[$key] = new AssetBundle([ $am->bundles[$key] = new AssetBundle([
'css' => [$url], 'css' => [Url::to($url)],
'cssOptions' => $options, 'cssOptions' => $options,
'depends' => (array) $depends, 'depends' => (array) $depends,
]); ]);
@@ -432,11 +433,8 @@ class View extends \yii\base\View
$this->jsFiles[$position][$key] = Html::jsFile($url, $options); $this->jsFiles[$position][$key] = Html::jsFile($url, $options);
} else { } else {
$am = Yii::$app->getAssetManager(); $am = Yii::$app->getAssetManager();
if (strpos($url, '/') !== 0 && strpos($url, '://') === false) {
$url = Yii::$app->getRequest()->getBaseUrl() . '/' . $url;
}
$am->bundles[$key] = new AssetBundle([ $am->bundles[$key] = new AssetBundle([
'js' => [$url], 'js' => [Url::to($url)],
'jsOptions' => $options, 'jsOptions' => $options,
'depends' => (array) $depends, 'depends' => (array) $depends,
]); ]);