Pass all the button's config array to Button::widget() instead of creating new…

Pass all the button's config array to Button::widget() instead of creating new one item by item. Now allowed to pass in ButtonGroup button's configs any possible attributes(like tagName, encodeLabel, etc).

Pass all the button's config array to Button::widget() instead of creating new…
d36bf9e8 · fly · Qiang Xue · 4e47b67f · d36bf9e8
Commit d36bf9e8 authored Oct 29, 2014 by fly Committed by Qiang Xue Nov 12, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 9 deletions

ButtonGroup.php extensions/bootstrap/ButtonGroup.php +4 -9

No files found.
--- a/extensions/bootstrap/ButtonGroup.php
+++ b/extensions/bootstrap/ButtonGroup.php
@@ -7,7 +7,6 @@

 namespace yii\bootstrap;

-use yii\helpers\ArrayHelper;
 use yii\helpers\Html;

 /**
@@ -81,14 +80,10 @@ class ButtonGroup extends Widget
        $buttons = [];
        foreach ($this->buttons as $button) {
            if (is_array($button)) {
-                $label = ArrayHelper::getValue($button, 'label');
-                $options = ArrayHelper::getValue($button, 'options');
-                $buttons[] = Button::widget([
-                    'label' => $label,
-                    'options' => $options,
-                    'encodeLabel' => $this->encodeLabels,
-                    'view' => $this->getView()
-                ]);
+                $button['view'] = $this->getView();
+                if (!isset($button['encodeLabel']))
+                    $button['encodeLabel'] = $this->encodeLabels;
+                $buttons[] = Button::widget($button);
            } else {
                $buttons[] = $button;
            }