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

Bootstrap's dropdown encodes also trailing caret tag

Browse Source
This commit is contained in:
Hisateru Tanaka
2013-12-25 22:54:12 +09:00
parent 0345191245
commit cfa25dd898
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/yii/bootstrap/ButtonDropdown.php
View File

@ -75,6 +75,10 @@ class ButtonDropdown extends Widget
protected function renderButton() protected function renderButton()
{ {
Html::addCssClass($this->options, 'btn'); Html::addCssClass($this->options, 'btn');
$label = $this->label;
if ($this->encodeLabel) {
$label = Html::encode($label);
}
if ($this->split) { if ($this->split) {
$options = $this->options; $options = $this->options;
$this->options['data-toggle'] = 'dropdown'; $this->options['data-toggle'] = 'dropdown';
@ -85,7 +89,7 @@ class ButtonDropdown extends Widget
'options' => $this->options, 'options' => $this->options,
]); ]);
} else { } else {
$this->label .= ' <span class="caret"></span>'; $label .= ' <span class="caret"></span>';
$options = $this->options; $options = $this->options;
if (!isset($options['href'])) { if (!isset($options['href'])) {
$options['href'] = '#'; $options['href'] = '#';
@ -96,9 +100,9 @@ class ButtonDropdown extends Widget
} }
return Button::widget([ return Button::widget([
'tagName' => $this->tagName, 'tagName' => $this->tagName,
'label' => $this->label, 'label' => $label,
'options' => $options, 'options' => $options,
'encodeLabel' => $this->encodeLabel, 'encodeLabel' => false,
]) . "\n" . $splitButton; ]) . "\n" . $splitButton;
} }