Addition .gitignore and fix type of items

yiidoc · Jan 24, 2015 · c4da2b3 · c4da2b3
1 parent a90dd7e
commit c4da2b3
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,13 @@
+# Created by .ignore support plugin (hsz.mobi)
+# phpstorm project files
+.idea
+# netbeans project files
+nbproject
+# zend studio for eclipse project files
+.buildpath
+.project
+.settings
+# composer itself is not needed
+composer.phar
+# Mac DS_Store Files
+.DS_Store
diff --git a/Selectize.php b/Selectize.php
@@ -1,25 +1,31 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: Nghia
- * Date: 10/10/2014
- * Time: 6:43 AM
- */
-
 namespace yii\selectize;
 
-
 use yii\helpers\Html;
 use yii\widgets\InputWidget;
 use yii\helpers\Json;
 use yii\jui\JuiAsset;
 
 class Selectize extends InputWidget
 {
-    public $items = [];
+    /**
+     * @var array
+     */
+    public $items;
+    /**
+     * @var array
+     * @see https://github.com/brianreavis/selectize.js/blob/master/docs/usage.md#options
+     */
     public $clientOptions;
+    /**
+     * @var array
+     * @see https://github.com/brianreavis/selectize.js/blob/master/docs/events.md
+     */
     public $clientEvents;
 
+    /**
+     * @inheritdoc
+     */
     public function init()
     {
         if (!isset($this->options['id'])) {
@@ -34,23 +40,29 @@ public function init()
         $this->registerEvents();
     }
 
+    /**
+     * @inheritdoc
+     */
     public function run()
     {
         if ($this->hasModel()) {
-            if (empty($this->items)) {
-                echo Html::activeTextInput($this->model, $this->attribute, $this->options);
-            } else {
+            if (is_array($this->items)) {
                 echo Html::activeDropDownList($this->model, $this->attribute, $this->items, $this->options);
+            } else {
+                echo Html::activeTextInput($this->model, $this->attribute, $this->options);
             }
         } else {
-            if (empty($this->items)) {
-                echo Html::textInput($this->name, $this->value, $this->options);
-            } else {
+            if (is_array($this->items)) {
                 echo Html::dropDownList($this->name, $this->value, $this->items, $this->options);
+            } else {
+                echo Html::textInput($this->name, $this->value, $this->options);
             }
         }
     }
 
+    /**
+     * Register asset bundles
+     */
     public function registerAssetBundle()
     {
         if (isset($this->clientOptions['plugins']) && array_search('drag_drop', $this->clientOptions['plugins'])) {
@@ -61,6 +73,9 @@ public function registerAssetBundle()
         SelectizeAsset::register($this->getView());
     }
 
+    /**
+     * Register client script
+     */
     public function registerJs()
     {
         if (!isset($this->clientOptions['create']) && empty($this->items)) {
@@ -70,6 +85,9 @@ public function registerJs()
         $this->getView()->registerJs("jQuery('#{$this->options['id']}').selectize({$clientOptions});");
     }
 
+    /**
+     * Register client script handles
+     */
     public function registerEvents()
     {
         if (!empty($this->clientEvents)) {