Error202
/
yii2-swiftmailer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fixes issue #234: Added Html::addCssClass() and removeCssClass().

tags/2.0.0-beta
Qiang Xue 11 years ago
parent
0b8d239ad3
commit
17b1e5d2fc
15 changed files with 104 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      framework/yii/bootstrap/Alert.php
  2. 2
      framework/yii/bootstrap/Button.php
  3. 8
      framework/yii/bootstrap/ButtonDropdown.php
  4. 2
      framework/yii/bootstrap/ButtonGroup.php
  5. 8
      framework/yii/bootstrap/Carousel.php
  6. 6
      framework/yii/bootstrap/Collapse.php
  7. 4
      framework/yii/bootstrap/Dropdown.php
  8. 2
      framework/yii/bootstrap/Modal.php
  9. 8
      framework/yii/bootstrap/Nav.php
  10. 4
      framework/yii/bootstrap/NavBar.php
  11. 4
      framework/yii/bootstrap/Progress.php
  12. 18
      framework/yii/bootstrap/Tabs.php
  13. 16
      framework/yii/bootstrap/Widget.php
  14. 38
      framework/yii/helpers/base/Html.php
  15. 32
      tests/unit/framework/helpers/HtmlTest.php

2
framework/yii/bootstrap/Alert.php
Unescape View File

@ -140,7 +140,7 @@ class Alert extends Widget
'class' => 'fade in',
), $this->options);
$this->addCssClass($this->options, 'alert');
Html::addCssClass($this->options, 'alert');
if ($this->closeButton !== null) {
$this->closeButton = array_merge(array(

2
framework/yii/bootstrap/Button.php
Unescape View File

@ -48,7 +48,7 @@ class Button extends Widget
{
parent::init();
$this->clientOptions = false;
$this->addCssClass($this->options, 'btn');
Html::addCssClass($this->options, 'btn');
}
/**

8
framework/yii/bootstrap/ButtonDropdown.php
Unescape View File

@ -64,7 +64,7 @@ class ButtonDropdown extends Widget
public function init()
{
parent::init();
$this->addCssClass($this->options, 'btn-group');
Html::addCssClass($this->options, 'btn-group');
}
/**
@ -85,12 +85,12 @@ class ButtonDropdown extends Widget
*/
protected function renderButton()
{
$this->addCssClass($this->buttonOptions, 'btn');
Html::addCssClass($this->buttonOptions, 'btn');
if ($this->split) {
$tag = 'button';
$options = $this->buttonOptions;
$this->buttonOptions['data-toggle'] = 'dropdown';
$this->addCssClass($this->buttonOptions, 'dropdown-toggle');
Html::addCssClass($this->buttonOptions, 'dropdown-toggle');
$splitButton = Button::widget(array(
'label' => '<span class="caret"></span>',
'encodeLabel' => false,
@ -103,7 +103,7 @@ class ButtonDropdown extends Widget
if (!isset($options['href'])) {
$options['href'] = '#';
}
$this->addCssClass($options, 'dropdown-toggle');
Html::addCssClass($options, 'dropdown-toggle');
$options['data-toggle'] = 'dropdown';
$splitButton = '';
}

2
framework/yii/bootstrap/ButtonGroup.php
Unescape View File

@ -61,7 +61,7 @@ class ButtonGroup extends Widget
{
parent::init();
$this->clientOptions = false;
$this->addCssClass($this->options, 'btn-group');
Html::addCssClass($this->options, 'btn-group');
}
/**

8
framework/yii/bootstrap/Carousel.php
Unescape View File

@ -70,7 +70,7 @@ class Carousel extends Widget
public function init()
{
parent::init();
$this->addCssClass($this->options, 'carousel');
Html::addCssClass($this->options, 'carousel');
}
/**
@ -96,7 +96,7 @@ class Carousel extends Widget
for ($i = 0, $count = count($this->items); $i < $count; $i++) {
$options = array('data-target' => '#' . $this->options['id'], 'data-slide-to' => $i);
if ($i === 0) {
$this->addCssClass($options, 'active');
Html::addCssClass($options, 'active');
}
$indicators[] = Html::tag('li', '', $options);
}
@ -140,9 +140,9 @@ class Carousel extends Widget
throw new InvalidConfigException('The "content" option is required.');
}
$this->addCssClass($options, 'item');
Html::addCssClass($options, 'item');
if ($index === 0) {
$this->addCssClass($options, 'active');
Html::addCssClass($options, 'active');
}
return Html::tag('div', $content . "\n" . $caption, $options);

6
framework/yii/bootstrap/Collapse.php
Unescape View File

@ -66,7 +66,7 @@ class Collapse extends Widget
public function init()
{
parent::init();
$this->addCssClass($this->options, 'accordion');
Html::addCssClass($this->options, 'accordion');
}
/**
@ -90,7 +90,7 @@ class Collapse extends Widget
$index = 0;
foreach ($this->items as $header => $item) {
$options = ArrayHelper::getValue($item, 'options', array());
$this->addCssClass($options, 'accordion-group');
Html::addCssClass($options, 'accordion-group');
$items[] = Html::tag('div', $this->renderItem($header, $item, ++$index), $options);
}
@ -111,7 +111,7 @@ class Collapse extends Widget
$id = $this->options['id'] . '-collapse' . $index;
$options = ArrayHelper::getValue($item, 'contentOptions', array());
$options['id'] = $id;
$this->addCssClass($options, 'accordion-body collapse');
Html::addCssClass($options, 'accordion-body collapse');
$header = Html::a($header, '#' . $id, array(
'class' => 'accordion-toggle',

4
framework/yii/bootstrap/Dropdown.php
Unescape View File

@ -46,7 +46,7 @@ class Dropdown extends Widget
public function init()
{
parent::init();
$this->addCssClass($this->options, 'dropdown-menu');
Html::addCssClass($this->options, 'dropdown-menu');
}
/**
@ -81,7 +81,7 @@ class Dropdown extends Widget
$linkOptions['tabindex'] = '-1';
if (isset($item['items'])) {
$this->addCssClass($options, 'dropdown-submenu');
Html::addCssClass($options, 'dropdown-submenu');
$content = Html::a($label, '#', $linkOptions) . $this->renderItems($item['items']);
} else {
$content = Html::a($label, ArrayHelper::getValue($item, 'url', '#'), $linkOptions);

2
framework/yii/bootstrap/Modal.php
Unescape View File

@ -197,7 +197,7 @@ class Modal extends Widget
$this->options = array_merge(array(
'class' => 'modal hide',
), $this->options);
$this->addCssClass($this->options, 'modal');
Html::addCssClass($this->options, 'modal');
$this->clientOptions = array_merge(array(
'show' => false,

8
framework/yii/bootstrap/Nav.php
Unescape View File

@ -79,7 +79,7 @@ class Nav extends Widget
public function init()
{
parent::init();
$this->addCssClass($this->options, 'nav');
Html::addCssClass($this->options, 'nav');
}
/**
@ -125,13 +125,13 @@ class Nav extends Widget
$linkOptions = ArrayHelper::getValue($item, 'linkOptions', array());
if (ArrayHelper::getValue($item, 'active')) {
$this->addCssClass($options, 'active');
Html::addCssClass($options, 'active');
}
if ($items !== null) {
$linkOptions['data-toggle'] = 'dropdown';
$this->addCssClass($options, 'dropdown');
$this->addCssClass($urlOptions, 'dropdown-toggle');
Html::addCssClass($options, 'dropdown');
Html::addCssClass($urlOptions, 'dropdown-toggle');
$label .= ' ' . Html::tag('b', '', array('class' => 'caret'));
if (is_array($items)) {
$items = Dropdown::widget(array(

4
framework/yii/bootstrap/NavBar.php
Unescape View File

@ -107,8 +107,8 @@ class NavBar extends Widget
{
parent::init();
$this->clientOptions = false;
$this->addCssClass($this->options, 'navbar');
$this->addCssClass($this->brandOptions, 'brand');
Html::addCssClass($this->options, 'navbar');
Html::addCssClass($this->brandOptions, 'brand');
}
/**

4
framework/yii/bootstrap/Progress.php
Unescape View File

@ -94,7 +94,7 @@ class Progress extends Widget
public function init()
{
parent::init();
$this->addCssClass($this->options, 'progress');
Html::addCssClass($this->options, 'progress');
}
/**
@ -139,7 +139,7 @@ class Progress extends Widget
*/
protected function renderBar($percent, $label = '', $options = array())
{
$this->addCssClass($options, 'bar');
Html::addCssClass($options, 'bar');
$options['style'] = "width:{$percent}%";
return Html::tag('div', $label, $options);
}

18
framework/yii/bootstrap/Tabs.php
Unescape View File

@ -93,7 +93,7 @@ class Tabs extends Widget
public function init()
{
parent::init();
$this->addCssClass($this->options, 'nav nav-tabs');
Html::addCssClass($this->options, 'nav nav-tabs');
}
/**
@ -123,10 +123,10 @@ class Tabs extends Widget
if (isset($item['items'])) {
$label .= ' <b class="caret"></b>';
$this->addCssClass($headerOptions, 'dropdown');
Html::addCssClass($headerOptions, 'dropdown');
if ($this->renderDropdown($item['items'], $panes)) {
$this->addCssClass($headerOptions, 'active');
Html::addCssClass($headerOptions, 'active');
}
$header = Html::a($label, "#", array('class' => 'dropdown-toggle', 'data-toggle' => 'dropdown')) . "\n"
@ -135,10 +135,10 @@ class Tabs extends Widget
$options = array_merge($this->itemOptions, ArrayHelper::getValue($item, 'options', array()));
$options['id'] = ArrayHelper::getValue($options, 'id', $this->options['id'] . '-tab' . $n);
$this->addCssClass($options, 'tab-pane');
Html::addCssClass($options, 'tab-pane');
if (ArrayHelper::remove($item, 'active')) {
$this->addCssClass($options, 'active');
$this->addCssClass($headerOptions, 'active');
Html::addCssClass($options, 'active');
Html::addCssClass($headerOptions, 'active');
}
$header = Html::a($label, '#' . $options['id'], array('data-toggle' => 'tab', 'tabindex' => '-1'));
$panes[] = Html::tag('div', $item['content'], $options);
@ -175,10 +175,10 @@ class Tabs extends Widget
$content = ArrayHelper::remove($item, 'content');
$options = ArrayHelper::remove($item, 'contentOptions', array());
$this->addCssClass($options, 'tab-pane');
Html::addCssClass($options, 'tab-pane');
if (ArrayHelper::remove($item, 'active')) {
$this->addCssClass($options, 'active');
$this->addCssClass($item['options'], 'active');
Html::addCssClass($options, 'active');
Html::addCssClass($item['options'], 'active');
$itemActive = true;
}

16
framework/yii/bootstrap/Widget.php
Unescape View File

@ -82,20 +82,4 @@ class Widget extends \yii\base\Widget
$view->registerJs(implode("\n", $js));
}
}
/**
* Adds a CSS class to the specified options.
* This method will ensure that the CSS class is unique and the "class" option is properly formatted.
* @param array $options the options to be modified.
* @param string $class the CSS class to be added
*/
protected function addCssClass(&$options, $class)
{
if (isset($options['class'])) {
$classes = preg_split('/\s+/', $options['class'] . ' ' . $class, -1, PREG_SPLIT_NO_EMPTY);
$options['class'] = implode(' ', array_unique($classes));
} else {
$options['class'] = $class;
}
}
}

38
framework/yii/helpers/base/Html.php
Unescape View File

@ -1373,6 +1373,44 @@ class Html
}
/**
* Adds a CSS class to the specified options.
* If the CSS class is already in the options, it will not be added again.
* @param array $options the options to be modified.
* @param string $class the CSS class to be added
*/
public static function addCssClass(&$options, $class)
{
if (isset($options['class'])) {
$classes = ' ' . $options['class'] . ' ';
if (($pos = strpos($classes, ' ' . $class . ' ')) === false) {
$options['class'] .= ' ' . $class;
}
} else {
$options['class'] = $class;
}
}
/**
* Removes a CSS class from the specified options.
* @param array $options the options to be modified.
* @param string $class the CSS class to be removed
*/
public static function removeCssClass(&$options, $class)
{
if (isset($options['class'])) {
$classes = array_unique(preg_split('/\s+/', $options['class'] . ' ' . $class, -1, PREG_SPLIT_NO_EMPTY));
if (($index = array_search($class, $classes)) !== false) {
unset($classes[$index]);
}
if (empty($classes)) {
unset($options['class']);
} else {
$options['class'] = implode(' ', $classes);
}
}
}
/**
* Returns the real attribute name from the given attribute expression.
*
* An attribute expression is an attribute name prefixed and/or suffixed with array indexes.

32
tests/unit/framework/helpers/HtmlTest.php
Unescape View File

@ -434,6 +434,38 @@ EOD;
Html::$showBooleanAttributeValues = true;
}
public function testAddCssClass()
{
$options = array();
Html::addCssClass($options, 'test');
$this->assertEquals(array('class' => 'test'), $options);
Html::addCssClass($options, 'test');
$this->assertEquals(array('class' => 'test'), $options);
Html::addCssClass($options, 'test2');
$this->assertEquals(array('class' => 'test test2'), $options);
Html::addCssClass($options, 'test');
$this->assertEquals(array('class' => 'test test2'), $options);
Html::addCssClass($options, 'test2');
$this->assertEquals(array('class' => 'test test2'), $options);
Html::addCssClass($options, 'test3');
$this->assertEquals(array('class' => 'test test2 test3'), $options);
Html::addCssClass($options, 'test2');
$this->assertEquals(array('class' => 'test test2 test3'), $options);
}
public function testRemoveCssClass()
{
$options = array('class' => 'test test2 test3');
Html::removeCssClass($options, 'test2');
$this->assertEquals(array('class' => 'test test3'), $options);
Html::removeCssClass($options, 'test2');
$this->assertEquals(array('class' => 'test test3'), $options);
Html::removeCssClass($options, 'test');
$this->assertEquals(array('class' => 'test3'), $options);
Html::removeCssClass($options, 'test3');
$this->assertEquals(array(), $options);
}
protected function getDataItems()
{
return array(

Write Preview
Loading…
Cancel
Save