Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Rotua Panjaitan
yii2
Commits
a0f9a6d7
Commit
a0f9a6d7
authored
Mar 31, 2014
by
Qiang Xue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #2937
parent
fcd7974f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
View.php
framework/web/View.php
+3
-5
No files found.
framework/web/View.php
View file @
a0f9a6d7
...
...
@@ -10,6 +10,7 @@ namespace yii\web;
use
Yii
;
use
yii\helpers\Html
;
use
yii\base\InvalidConfigException
;
use
yii\helpers\Url
;
/**
* View represents a view object in the MVC pattern.
...
...
@@ -371,7 +372,7 @@ class View extends \yii\base\View
}
else
{
$am
=
Yii
::
$app
->
getAssetManager
();
$am
->
bundles
[
$key
]
=
new
AssetBundle
([
'css'
=>
[
$url
],
'css'
=>
[
Url
::
to
(
$url
)
],
'cssOptions'
=>
$options
,
'depends'
=>
(
array
)
$depends
,
]);
...
...
@@ -432,11 +433,8 @@ class View extends \yii\base\View
$this
->
jsFiles
[
$position
][
$key
]
=
Html
::
jsFile
(
$url
,
$options
);
}
else
{
$am
=
Yii
::
$app
->
getAssetManager
();
if
(
strpos
(
$url
,
'/'
)
!==
0
&&
strpos
(
$url
,
'://'
)
===
false
)
{
$url
=
Yii
::
$app
->
getRequest
()
->
getBaseUrl
()
.
'/'
.
$url
;
}
$am
->
bundles
[
$key
]
=
new
AssetBundle
([
'js'
=>
[
$url
],
'js'
=>
[
Url
::
to
(
$url
)
],
'jsOptions'
=>
$options
,
'depends'
=>
(
array
)
$depends
,
]);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment