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

Fixes #653: use boolean type to indicate boolean attributes.

Browse Source
This commit is contained in:
Qiang Xue
2013-07-23 20:45:14 -04:00
parent 1f5d77790f
commit 915a3cd779
2 changed files with 8 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
framework/yii/helpers/HtmlBase.php
View File

@ -44,42 +44,6 @@ class HtmlBase
'track' => 1, 'track' => 1,
'wbr' => 1, 'wbr' => 1,
); );
/**
* @var array list of boolean attributes. The presence of a boolean attribute on
* an element represents the true value, and the absence of the attribute represents the false value.
* @see http://www.w3.org/TR/html5/infrastructure.html#boolean-attributes
*/
public static $booleanAttributes = array(
'async' => 1,
'autobuffer' => 1,
'autofocus' => 1,
'autoplay' => 1,
'checked' => 1,
'controls' => 1,
'declare' => 1,
'default' => 1,
'defer' => 1,
'disabled' => 1,
'formnovalidate' => 1,
'hidden' => 1,
'ismap' => 1,
'itemscope' => 1,
'loop' => 1,
'multiple' => 1,
'muted' => 1,
'nohref' => 1,
'noresize' => 1,
'novalidate' => 1,
'open' => 1,
'pubdate' => 1,
'readonly' => 1,
'required' => 1,
'reversed' => 1,
'scoped' => 1,
'seamless' => 1,
'selected' => 1,
'typemustmatch' => 1,
);
/** /**
* @var array the preferred order of attributes in a tag. This mainly affects the order of the attributes * @var array the preferred order of attributes in a tag. This mainly affects the order of the attributes
* that are rendered by [[renderAttributes()]]. * that are rendered by [[renderAttributes()]].
@ -450,7 +414,7 @@ class HtmlBase
{ {
$options['type'] = $type; $options['type'] = $type;
$options['name'] = $name; $options['name'] = $name;
$options['value'] = $value; $options['value'] = $value === null ? null : (string)$value;
return static::tag('input', '', $options); return static::tag('input', '', $options);
} }
@ -1322,7 +1286,7 @@ class HtmlBase
$lines[] = static::tag('optgroup', "\n" . $content . "\n", $groupAttrs); $lines[] = static::tag('optgroup', "\n" . $content . "\n", $groupAttrs);
} else { } else {
$attrs = isset($options[$key]) ? $options[$key] : array(); $attrs = isset($options[$key]) ? $options[$key] : array();
$attrs['value'] = $key; $attrs['value'] = (string)$key;
$attrs['selected'] = $selection !== null && $attrs['selected'] = $selection !== null &&
(!is_array($selection) && !strcmp($key, $selection) (!is_array($selection) && !strcmp($key, $selection)
|| is_array($selection) && in_array($key, $selection)); || is_array($selection) && in_array($key, $selection));
@ -1335,12 +1299,11 @@ class HtmlBase
/** /**
* Renders the HTML tag attributes. * Renders the HTML tag attributes.
* Boolean attributes such as s 'checked', 'disabled', 'readonly', will be handled specially * Attributes whose values are of boolean type will be treated as [boolean attributes](http://www.w3.org/TR/html5/infrastructure.html#boolean-attributes).
* according to [[booleanAttributes]] and [[showBooleanAttributeValues]]. * And attributes whose values are null will not be rendered.
* @param array $attributes attributes to be rendered. The attribute values will be HTML-encoded using [[encode()]]. * @param array $attributes attributes to be rendered. The attribute values will be HTML-encoded using [[encode()]].
* Attributes whose value is null will be ignored and not put in the rendering result.
* @return string the rendering result. If the attributes are not empty, they will be rendered * @return string the rendering result. If the attributes are not empty, they will be rendered
* into a string with a leading white space (such that it can be directly appended to the tag name * into a string with a leading white space (so that it can be directly appended to the tag name
* in a tag. If there is no attribute, an empty string will be returned. * in a tag. If there is no attribute, an empty string will be returned.
*/ */
public static function renderTagAttributes($attributes) public static function renderTagAttributes($attributes)
@ -1357,8 +1320,8 @@ class HtmlBase
$html = ''; $html = '';
foreach ($attributes as $name => $value) { foreach ($attributes as $name => $value) {
if (isset(static::$booleanAttributes[strtolower($name)])) { if (is_bool($value)) {
if ($value || strcasecmp($name, $value) === 0) { if ($value) {
$html .= " $name"; $html .= " $name";
} }
} elseif ($value !== null) { } elseif ($value !== null) {

2
tests/unit/framework/helpers/HtmlTest.php
View File

@ -471,7 +471,7 @@ EOD;
{ {
$this->assertEquals('', Html::renderTagAttributes(array())); $this->assertEquals('', Html::renderTagAttributes(array()));
$this->assertEquals(' name="test" value="1&lt;&gt;"', Html::renderTagAttributes(array('name' => 'test', 'empty' => null, 'value' => '1<>'))); $this->assertEquals(' name="test" value="1&lt;&gt;"', Html::renderTagAttributes(array('name' => 'test', 'empty' => null, 'value' => '1<>')));
$this->assertEquals(' checked disabled', Html::renderTagAttributes(array('checked' => 'checked', 'disabled' => true, 'hidden' => false))); $this->assertEquals(' checked disabled', Html::renderTagAttributes(array('checked' => true, 'disabled' => true, 'hidden' => false)));
} }
public function testAddCssClass() public function testAddCssClass()