Browse Source

Merge branch 'master' into new-asset

Conflicts:
	apps/basic/composer.json
	composer.json
tags/2.0.0-rc
Qiang Xue 10 years ago
parent
commit
774ae2e19f
  1. 10
      ActiveField.php
  2. 8
      ActiveForm.php

10
ActiveField.php

@ -248,10 +248,13 @@ class ActiveField extends \yii\widgets\ActiveField
} }
if (!isset($options['itemOptions'])) { if (!isset($options['itemOptions'])) {
$options['itemOptions'] = [ $options['itemOptions'] = [
'container' => false,
'labelOptions' => ['class' => 'checkbox-inline'], 'labelOptions' => ['class' => 'checkbox-inline'],
]; ];
} }
} elseif (!isset($options['item'])) {
$options['item'] = function ($index, $label, $name, $checked, $value) {
return '<div class="checkbox">' . Html::checkbox($name, $checked, ['label' => $label, 'value' => $value]) . '</div>';
};
} }
parent::checkboxList($items, $options); parent::checkboxList($items, $options);
return $this; return $this;
@ -271,10 +274,13 @@ class ActiveField extends \yii\widgets\ActiveField
} }
if (!isset($options['itemOptions'])) { if (!isset($options['itemOptions'])) {
$options['itemOptions'] = [ $options['itemOptions'] = [
'container' => false,
'labelOptions' => ['class' => 'radio-inline'], 'labelOptions' => ['class' => 'radio-inline'],
]; ];
} }
} elseif (!isset($options['item'])) {
$options['item'] = function ($index, $label, $name, $checked, $value) {
return '<div class="radio">' . Html::radio($name, $checked, ['label' => $label, 'value' => $value]) . '</div>';
};
} }
parent::radioList($items, $options); parent::radioList($items, $options);
return $this; return $this;

8
ActiveForm.php

@ -66,6 +66,11 @@ use yii\base\InvalidConfigException;
class ActiveForm extends \yii\widgets\ActiveForm class ActiveForm extends \yii\widgets\ActiveForm
{ {
/** /**
* @var string the default field class name when calling [[field()]] to create a new field.
* @see fieldConfig
*/
public $fieldClass = 'yii\bootstrap\ActiveField';
/**
* @var array HTML attributes for the form tag. Default is `['role' => 'form']`. * @var array HTML attributes for the form tag. Default is `['role' => 'form']`.
*/ */
public $options = ['role' => 'form']; public $options = ['role' => 'form'];
@ -91,9 +96,6 @@ class ActiveForm extends \yii\widgets\ActiveForm
if ($this->layout !== 'default') { if ($this->layout !== 'default') {
Html::addCssClass($this->options, 'form-' . $this->layout); Html::addCssClass($this->options, 'form-' . $this->layout);
} }
if (!isset($this->fieldConfig['class'])) {
$this->fieldConfig['class'] = ActiveField::className();
}
parent::init(); parent::init();
} }
} }

Loading…
Cancel
Save