Merge branch 'master' of github.com:yiisoft/yii2

framework/yii/assets/yii.validation.js

@@ -87,8 +87,8 @@ yii.validation = (function ($) {
 			if (options.skipOnEmpty && isEmpty(value)) {
 				return;
 			}
-			var valid = !options.not && $.inArray(value, options.range)
-				|| options.not && !$.inArray(value, options.range);
+			var valid = !options.not && $.inArray(value, options.range) > -1
+				|| options.not && $.inArray(value, options.range) == -1;
 
 			if (!valid) {
 				messages.push(options.message);

framework/yii/jui/Draggable.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\jui;
+
+use yii\helpers\Html;
+
+/**
+ * Draggable renders an draggable jQuery UI widget.
+ *
+ * For example:
+ *
+ * ```php
+ * Draggable::begin(array(
+ *     'clientOptions' => array(
+ *         'grid' => array(50, 20),
+ *     ),
+ * ));
+ *
+ * echo 'Draggable contents here...';
+ *
+ * Draggable::end();
+ * ```
+ *
+ * @see http://api.jqueryui.com/draggable/
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+class Draggable extends Widget
+{
+	/**
+	 * Initializes the widget.
+	 */
+	public function init()
+	{
+		parent::init();
+		echo Html::beginTag('div', $this->options) . "\n";
+	}
+
+	/**
+	 * Renders the widget.
+	 */
+	public function run()
+	{
+		echo Html::endTag('div') . "\n";
+		$this->registerWidget('draggable', false);
+	}
+}

framework/yii/jui/Droppable.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\jui;
+
+use yii\helpers\Html;
+
+/**
+ * Droppable renders an droppable jQuery UI widget.
+ *
+ * For example:
+ *
+ * ```php
+ * Droppable::begin(array(
+ *     'clientOptions' => array(
+ *         'accept' => '.special',
+ *     ),
+ * ));
+ *
+ * echo 'Droppable body here...';
+ *
+ * Droppable::end();
+ * ```
+ *
+ * @see http://api.jqueryui.com/droppable/
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+class Droppable extends Widget
+{
+	/**
+	 * Initializes the widget.
+	 */
+	public function init()
+	{
+		parent::init();
+		echo Html::beginTag('div', $this->options) . "\n";
+	}
+
+	/**
+	 * Renders the widget.
+	 */
+	public function run()
+	{
+		echo Html::endTag('div') . "\n";
+		$this->registerWidget('droppable', false);
+	}
+}

framework/yii/jui/Resizable.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\jui;
+
+use yii\helpers\Html;
+
+/**
+ * Resizable renders an resizable jQuery UI widget.
+ *
+ * For example:
+ *
+ * ```php
+ * Resizable::begin(array(
+ *     'clientOptions' => array(
+ *         'grid' => array(20, 10),
+ *     ),
+ * ));
+ *
+ * echo 'Resizable contents here...';
+ *
+ * Resizable::end();
+ * ```
+ *
+ * @see http://api.jqueryui.com/resizable/
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+class Resizable extends Widget
+{
+	/**
+	 * Initializes the widget.
+	 */
+	public function init()
+	{
+		parent::init();
+		echo Html::beginTag('div', $this->options) . "\n";
+	}
+
+	/**
+	 * Renders the widget.
+	 */
+	public function run()
+	{
+		echo Html::endTag('div') . "\n";
+		$this->registerWidget('resizable');
+	}
+}

framework/yii/jui/Selectable.php

@@ -0,0 +1,116 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\jui;
+
+use yii\base\InvalidConfigException;
+use yii\helpers\ArrayHelper;
+use yii\helpers\Html;
+
+/**
+ * Selectable renders a selectable jQuery UI widget.
+ *
+ * For example:
+ *
+ * ```php
+ * echo Selectable::widget(array(
+ *     'items' => array(
+ *         'Item 1',
+ *         array(
+ *             'content' => 'Item2',
+ *         ),
+ *         array(
+ *             'content' => 'Item3',
+ *             'options' => array(
+ *                 'tag' => 'li',
+ *             ),
+ *         ),
+ *     ),
+ *     'options' => array(
+ *         'tag' => 'ul',
+ *     ),
+ *     'itemOptions' => array(
+ *         'tag' => 'li',
+ *     ),
+ *     'clientOptions' => array(
+ *         'tolerance' => 'fit',
+ *     ),
+ * ));
+ * ```
+ *
+ * @see http://api.jqueryui.com/selectable/
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+class Selectable extends Widget
+{
+	/**
+	 * @var array the HTML attributes for the widget container tag. The following special options are recognized:
+	 *
+	 * - tag: string, defaults to "ul", the tag name of the container tag of this widget
+	 */
+	public $options = array();
+	/**
+	 * @var array list of selectable items. Each item can be a string representing the item content
+	 * or an array of the following structure:
+	 *
+	 * ~~~
+	 * array(
+	 *     'content' => 'item content',
+	 *     // the HTML attributes of the item container tag. This will overwrite "itemOptions".
+	 *     'options' => array(),
+	 * )
+	 * ~~~
+	 */
+	public $items = array();
+	/**
+	 * @var array list of HTML attributes for the item container tags. This will be overwritten
+	 * by the "options" set in individual [[items]]. The following special options are recognized:
+	 *
+	 * - tag: string, defaults to "li", the tag name of the item container tags.
+	 */
+	public $itemOptions = array();
+
+
+	/**
+	 * Renders the widget.
+	 */
+	public function run()
+	{
+		$options = $this->options;
+		$tag = ArrayHelper::remove($options, 'tag', 'ul');
+		echo Html::beginTag($tag, $options) . "\n";
+		echo $this->renderItems() . "\n";
+		echo Html::endTag($tag) . "\n";
+		$this->registerWidget('selectable');
+	}
+
+	/**
+	 * Renders selectable items as specified on [[items]].
+	 * @return string the rendering result.
+	 * @throws InvalidConfigException.
+	 */
+	public function renderItems()
+	{
+		$items = array();
+		foreach ($this->items as $item) {
+			$options = $this->itemOptions;
+			$tag = ArrayHelper::remove($options, 'tag', 'li');
+			if (is_array($item)) {
+				if (!isset($item['content'])) {
+					throw new InvalidConfigException("The 'content' option is required.");
+				}
+				$options = array_merge($options, ArrayHelper::getValue($item, 'options', array()));
+				$tag = ArrayHelper::remove($options, 'tag', $tag);
+				$items[] = Html::tag($tag, $item['content'], $options);
+			} else {
+				$items[] = Html::tag($tag, $item, $options);
+			}
+		}
+		return implode("\n", $items);
+	}
+}

framework/yii/jui/Spinner.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\jui;
+
+use Yii;
+use yii\helpers\Html;
+
+/**
+ * Spinner renders an spinner jQuery UI widget.
+ *
+ * For example:
+ *
+ * ```php
+ * echo Spinner::widget(array(
+ *     'model' => $model,
+ *     'attribute' => 'country',
+ *     'clientOptions' => array(
+ *         'step' => 2,
+ *     ),
+ * ));
+ * ```
+ *
+ * The following example will use the name property instead:
+ *
+ * ```php
+ * echo Spinner::widget(array(
+ *     'name'  => 'country',
+ *     'clientOptions' => array(
+ *         'step' => 2,
+ *     ),
+ * ));
+ *```
+ *
+ * @see http://api.jqueryui.com/spinner/
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+class Spinner extends InputWidget
+{
+	/**
+	 * Renders the widget.
+	 */
+	public function run()
+	{
+		echo $this->renderWidget();
+		$this->registerWidget('spinner');
+	}
+
+	/**
+	 * Renders the Spinner widget.
+	 * @return string the rendering result.
+	 */
+	public function renderWidget()
+	{
+		if ($this->hasModel()) {
+			return Html::activeTextInput($this->model, $this->attribute, $this->options);
+		} else {
+			return Html::textInput($this->name, $this->value, $this->options);
+		}
+	}
+}