Commit 9ed1ed6e by Qiang Xue

Merge pull request #1617 from tanakahisateru/twbs-dropdown-caret

Bootstrap's dropdown encodes also trailing caret tag
parents 03451912 cfa25dd8
......@@ -75,6 +75,10 @@ class ButtonDropdown extends Widget
protected function renderButton()
{
Html::addCssClass($this->options, 'btn');
$label = $this->label;
if ($this->encodeLabel) {
$label = Html::encode($label);
}
if ($this->split) {
$options = $this->options;
$this->options['data-toggle'] = 'dropdown';
......@@ -85,7 +89,7 @@ class ButtonDropdown extends Widget
'options' => $this->options,
]);
} else {
$this->label .= ' <span class="caret"></span>';
$label .= ' <span class="caret"></span>';
$options = $this->options;
if (!isset($options['href'])) {
$options['href'] = '#';
......@@ -96,9 +100,9 @@ class ButtonDropdown extends Widget
}
return Button::widget([
'tagName' => $this->tagName,
'label' => $this->label,
'label' => $label,
'options' => $options,
'encodeLabel' => $this->encodeLabel,
'encodeLabel' => false,
]) . "\n" . $splitButton;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment