Refactoring

framework/yii/jui/Tabs.php

@@ -42,7 +42,7 @@ use yii\helpers\Html;
  *         ),
  *         array(
  *             'label' => 'Ajax tab',
- *             'ajax' => array('ajax/content'),
+ *             'url' => array('ajax/content'),
  *         ),
  *     ),
  *     'options' => array(
@@ -75,19 +75,13 @@ class Tabs extends Widget
 	/**
 	 * @var array list of tab items. Each item can be an array of the following structure:
 	 *
-	 * ~~~
+	 * - label: string, required, specifies the header link label. When [[encodeLabels]] is true, the label
-	 * array(
+	 *   will be HTML-encoded.
-	 *     'label' => 'Tab header label',
+	 * - content: string, @todo comment
-	 *     'content' => 'Tab item content',
+	 * - url: mixed, @todo comment
-	 *     'ajax' => 'http://www.yiiframework.com', //or array('ajax/action'),
+	 * - template: string, optional, @todo comment
-	 *     // the HTML attributes of the item container tag. This will overwrite "itemOptions".
+	 * - options: array, optional, @todo comment
-	 *     'options' => array(),
+	 * - headerOptions: array, optional, @todo comment
-	 *     // the HTML attributes of the header container tag. This will overwrite "headerOptions".
-	 *     'headerOptions' = array(),
-     *     // @todo comment.
-	 *     'template'
-	 * )
-	 * ~~~
 	 */
 	public $items = array();
 	/**
@@ -103,13 +97,11 @@ class Tabs extends Widget
 	 */
 	public $headerOptions = array();
 	/**
-	 * @var string
+	 * @var string @todo comment
-	 * @todo comment.
 	 */
 	public $linkTemplate = '<a href="{url}">{label}</a>';
 	/**
-	 * @var boolean
+	 * @var boolean whether the labels for header items should be HTML-encoded.
-	 * @todo comment.
 	 */
 	public $encodeLabels = true;
 
@@ -140,11 +132,11 @@ class Tabs extends Widget
 			if (!isset($item['label'])) {
 				throw new InvalidConfigException("The 'label' option is required.");
 			}
-			if (isset($item['ajax'])) {
+			if (isset($item['url'])) {
-				$url = $item['ajax'];
+				$url = Html::url($item['url']);
 			} else {
 				if (!isset($item['content'])) {
-					throw new InvalidConfigException("The 'content' or 'ajax' option is required.");
+					throw new InvalidConfigException("The 'content' or 'url' option is required.");
 				}
 				$options = array_merge($this->itemOptions, ArrayHelper::getValue($item, 'options', array()));
 				$tag = ArrayHelper::remove($options, 'tag', 'div');
@@ -158,7 +150,7 @@ class Tabs extends Widget
 			$template = ArrayHelper::getValue($item, 'template', $this->linkTemplate);
 			$headers[] = Html::tag('li', strtr($template, array(
 				'{label}' => $this->encodeLabels ? Html::encode($item['label']) : $item['label'],
-				'{url}' => Html::url($url),
+				'{url}' => $url,
 			)), $headerOptions);
 		}
 		return Html::tag('ul', implode("\n", $headers)) . "\n" . implode("\n", $items);