Commit cc5981e2 by Alexander Kochetov

Post final ;)

parent f50e8f6b
...@@ -80,14 +80,13 @@ class Tabs extends Widget ...@@ -80,14 +80,13 @@ class Tabs extends Widget
{ {
$headers = array(); $headers = array();
foreach ($this->items as $n => $item) { foreach ($this->items as $n => $item) {
if (!isset($item['header'])) {
throw new InvalidConfigException("The 'header' option is required.");
}
$options = ArrayHelper::getValue($item, 'options', array()); $options = ArrayHelper::getValue($item, 'options', array());
$id = isset($options['id']) ? $options['id'] : $this->options['id'] . '-tab' . $n; $id = isset($options['id']) ? $options['id'] : $this->options['id'] . '-tab' . $n;
if (isset($item['header'])) {
$headerOptions = ArrayHelper::getValue($item, 'headerOptions', array()); $headerOptions = ArrayHelper::getValue($item, 'headerOptions', array());
$headers[] = Html::tag('li', Html::a($item['header'], "#$id"), $headerOptions); $headers[] = Html::tag('li', Html::a($item['header'], "#$id"), $headerOptions);
} else {
throw new InvalidConfigException("The 'header' option is required.");
}
} }
return Html::tag('ul', implode("\n", $headers)); return Html::tag('ul', implode("\n", $headers));
...@@ -102,16 +101,15 @@ class Tabs extends Widget ...@@ -102,16 +101,15 @@ class Tabs extends Widget
{ {
$contents = array(); $contents = array();
foreach ($this->items as $n => $item) { foreach ($this->items as $n => $item) {
if (!isset($item['content'])) {
throw new InvalidConfigException("The 'content' option is required.");
}
$id = $this->options['id'] . '-tab' . $n; $id = $this->options['id'] . '-tab' . $n;
if (isset($item['content'])) {
$options = ArrayHelper::getValue($item, 'options', array()); $options = ArrayHelper::getValue($item, 'options', array());
if (!isset($options['id'])) { if (!isset($options['id'])) {
$options['id'] = $id; $options['id'] = $id;
} }
$contents[] = Html::tag('div', $item['content'], $options); $contents[] = Html::tag('div', $item['content'], $options);
} else {
throw new InvalidConfigException("The 'content' option is required.");
}
} }
return implode("\n", $contents); return implode("\n", $contents);
......
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