Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Y
yii2bootstrap
Project
Project
Details
Activity
Releases
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
夏彬
yii2bootstrap
Commits
914608ae
Commit
914608ae
authored
Feb 24, 2015
by
Sam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed widgets using echo in their run. #7417
parent
0bbace38
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
27 additions
and
19 deletions
+27
-19
Button.php
Button.php
+1
-1
ButtonDropdown.php
ButtonDropdown.php
+6
-4
ButtonGroup.php
ButtonGroup.php
+1
-1
Carousel.php
Carousel.php
+7
-5
Collapse.php
Collapse.php
+5
-3
Dropdown.php
Dropdown.php
+1
-1
Nav.php
Nav.php
+1
-1
Progress.php
Progress.php
+5
-3
No files found.
Button.php
View file @
914608ae
...
...
@@ -56,7 +56,7 @@ class Button extends Widget
*/
public
function
run
()
{
echo
Html
::
tag
(
$this
->
tagName
,
$this
->
encodeLabel
?
Html
::
encode
(
$this
->
label
)
:
$this
->
label
,
$this
->
options
);
$this
->
registerPlugin
(
'button'
);
return
Html
::
tag
(
$this
->
tagName
,
$this
->
encodeLabel
?
Html
::
encode
(
$this
->
label
)
:
$this
->
label
,
$this
->
options
);
}
}
ButtonDropdown.php
View file @
914608ae
...
...
@@ -79,11 +79,13 @@ class ButtonDropdown extends Widget
$options
=
$this
->
containerOptions
;
$tag
=
ArrayHelper
::
remove
(
$options
,
'tag'
,
'div'
);
echo
Html
::
beginTag
(
$tag
,
$this
->
containerOptions
);
echo
"
\n
"
.
$this
->
renderButton
();
echo
"
\n
"
.
$this
->
renderDropdown
();
echo
"
\n
"
.
Html
::
endTag
(
$tag
);
$this
->
registerPlugin
(
'button'
);
return
implode
(
"
\n
"
,
[
Html
::
beginTag
(
$tag
,
$this
->
containerOptions
),
$this
->
renderButton
(),
$this
->
renderDropdown
(),
Html
::
endTag
(
$tag
)
]);
}
/**
...
...
ButtonGroup.php
View file @
914608ae
...
...
@@ -67,8 +67,8 @@ class ButtonGroup extends Widget
*/
public
function
run
()
{
echo
Html
::
tag
(
'div'
,
$this
->
renderButtons
(),
$this
->
options
);
BootstrapAsset
::
register
(
$this
->
getView
());
return
Html
::
tag
(
'div'
,
$this
->
renderButtons
(),
$this
->
options
);
}
/**
...
...
Carousel.php
View file @
914608ae
...
...
@@ -81,12 +81,14 @@ class Carousel extends Widget
*/
public
function
run
()
{
echo
Html
::
beginTag
(
'div'
,
$this
->
options
)
.
"
\n
"
;
echo
$this
->
renderIndicators
()
.
"
\n
"
;
echo
$this
->
renderItems
()
.
"
\n
"
;
echo
$this
->
renderControls
()
.
"
\n
"
;
echo
Html
::
endTag
(
'div'
)
.
"
\n
"
;
$this
->
registerPlugin
(
'carousel'
);
return
implode
(
"
\n
"
,
[
Html
::
beginTag
(
'div'
,
$this
->
options
),
$this
->
renderIndicators
(),
$this
->
renderItems
(),
$this
->
renderControls
(),
Html
::
endTag
(
'div'
)
]);
}
/**
...
...
Collapse.php
View file @
914608ae
...
...
@@ -76,10 +76,12 @@ class Collapse extends Widget
*/
public
function
run
()
{
echo
Html
::
beginTag
(
'div'
,
$this
->
options
)
.
"
\n
"
;
echo
$this
->
renderItems
()
.
"
\n
"
;
echo
Html
::
endTag
(
'div'
)
.
"
\n
"
;
$this
->
registerPlugin
(
'collapse'
);
return
implode
(
"
\n
"
,
[
Html
::
beginTag
(
'div'
,
$this
->
options
),
$this
->
renderItems
(),
Html
::
endTag
(
'div'
)
]);
}
/**
...
...
Dropdown.php
View file @
914608ae
...
...
@@ -73,9 +73,9 @@ class Dropdown extends Widget
*/
public
function
run
()
{
echo
$this
->
renderItems
(
$this
->
items
,
$this
->
options
);
BootstrapPluginAsset
::
register
(
$this
->
getView
());
$this
->
registerClientEvents
();
return
$this
->
renderItems
(
$this
->
items
,
$this
->
options
);
}
/**
...
...
Nav.php
View file @
914608ae
...
...
@@ -115,8 +115,8 @@ class Nav extends Widget
*/
public
function
run
()
{
echo
$this
->
renderItems
();
BootstrapAsset
::
register
(
$this
->
getView
());
return
$this
->
renderItems
();
}
/**
...
...
Progress.php
View file @
914608ae
...
...
@@ -105,10 +105,12 @@ class Progress extends Widget
*/
public
function
run
()
{
echo
Html
::
beginTag
(
'div'
,
$this
->
options
)
.
"
\n
"
;
echo
$this
->
renderProgress
()
.
"
\n
"
;
echo
Html
::
endTag
(
'div'
)
.
"
\n
"
;
BootstrapAsset
::
register
(
$this
->
getView
());
return
implode
(
"
\n
"
,
[
Html
::
beginTag
(
'div'
,
$this
->
options
),
$this
->
renderProgress
(),
Html
::
endTag
(
'div'
)
]);
}
/**
...
...
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