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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
4e347d70
Commit
4e347d70
authored
May 22, 2013
by
Qiang Xue
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #348 from creocoder/bootstrap-fixes
A little yii\bootstrap\* classes refactoring
parents
a954312a
5743d482
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
3 deletions
+1
-3
Alert.php
framework/yii/bootstrap/Alert.php
+0
-1
Modal.php
framework/yii/bootstrap/Modal.php
+0
-1
TypeAhead.php
framework/yii/bootstrap/TypeAhead.php
+0
-1
Widget.php
framework/yii/bootstrap/Widget.php
+1
-0
No files found.
framework/yii/bootstrap/Alert.php
View file @
4e347d70
...
@@ -77,7 +77,6 @@ class Alert extends Widget
...
@@ -77,7 +77,6 @@ class Alert extends Widget
{
{
parent
::
init
();
parent
::
init
();
$this
->
getView
()
->
registerAssetBundle
(
'yii/bootstrap/alert'
);
$this
->
initOptions
();
$this
->
initOptions
();
echo
Html
::
beginTag
(
'div'
,
$this
->
options
)
.
"
\n
"
;
echo
Html
::
beginTag
(
'div'
,
$this
->
options
)
.
"
\n
"
;
...
...
framework/yii/bootstrap/Modal.php
View file @
4e347d70
...
@@ -102,7 +102,6 @@ class Modal extends Widget
...
@@ -102,7 +102,6 @@ class Modal extends Widget
{
{
parent
::
init
();
parent
::
init
();
$this
->
getView
()
->
registerAssetBundle
(
'yii/bootstrap/modal'
);
$this
->
initOptions
();
$this
->
initOptions
();
echo
$this
->
renderToggleButton
()
.
"
\n
"
;
echo
$this
->
renderToggleButton
()
.
"
\n
"
;
...
...
framework/yii/bootstrap/TypeAhead.php
View file @
4e347d70
...
@@ -68,7 +68,6 @@ class TypeAhead extends Widget
...
@@ -68,7 +68,6 @@ class TypeAhead extends Widget
*/
*/
public
function
run
()
public
function
run
()
{
{
$this
->
getView
()
->
registerAssetBundle
(
'yii/bootstrap/typeahead'
);
echo
$this
->
renderField
();
echo
$this
->
renderField
();
$this
->
registerPlugin
(
'typeahead'
);
$this
->
registerPlugin
(
'typeahead'
);
}
}
...
...
framework/yii/bootstrap/Widget.php
View file @
4e347d70
...
@@ -67,6 +67,7 @@ class Widget extends \yii\base\Widget
...
@@ -67,6 +67,7 @@ class Widget extends \yii\base\Widget
$id
=
$this
->
options
[
'id'
];
$id
=
$this
->
options
[
'id'
];
$view
=
$this
->
getView
();
$view
=
$this
->
getView
();
$view
->
registerAssetBundle
(
static
::
$responsive
?
'yii/bootstrap/responsive'
:
'yii/bootstrap'
);
$view
->
registerAssetBundle
(
static
::
$responsive
?
'yii/bootstrap/responsive'
:
'yii/bootstrap'
);
$view
->
registerAssetBundle
(
"yii/bootstrap/
$name
"
);
if
(
$this
->
pluginOptions
!==
false
)
{
if
(
$this
->
pluginOptions
!==
false
)
{
$options
=
empty
(
$this
->
pluginOptions
)
?
''
:
Json
::
encode
(
$this
->
pluginOptions
);
$options
=
empty
(
$this
->
pluginOptions
)
?
''
:
Json
::
encode
(
$this
->
pluginOptions
);
...
...
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