Merge remote-tracking branch 'origin/master' into embedded-widget

Author: unclead

CHANGELOG.md

@@ -1,9 +1,14 @@
 Yii2 multiple input change log
 ==============================
 
-1.2.19 in development
+1.2.20 in development
 ---------------------
 
+1.2.19
+------
+
+- #85: fixed `$enableError` not render element in template (thiagotalma)
+
 1.2.18
 ------
 

README.md

@@ -8,7 +8,7 @@ Yii2 widget for handle multiple inputs for an attribute of model
 [![License](https://poser.pugx.org/unclead/yii2-multiple-input/license)](https://packagist.org/packages/unclead/yii2-multiple-input)
 
 ##Latest release
-The latest version of the extension is v1.2.18. Follow the [instruction](./UPGRADE.md) for upgrading from previous versions
+The latest version of the extension is v1.2.19. Follow the [instruction](./UPGRADE.md) for upgrading from previous versions
 
 Contents:
 

composer.json

@@ -9,7 +9,7 @@
         "yii2 tabular input"
     ],
     "type": "yii2-extension",
-    "version": "1.2.18",
+    "version": "1.2.19",
     "license": "BSD-3-Clause",
     "support": {
         "issues": "https://github.com/unclead/yii2-multiple-input/issues?state=open",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jquery.multipleInput",
-  "version": "1.2.18",
+  "version": "1.2.19",
   "description": "jQuery multipleInput",
   "scripts": {
 	  "build": "npm install && (gulp || node node_modules/gulp/bin/gulp.js)"

src/assets/src/js/jquery.multipleInput.js

@@ -200,7 +200,7 @@
                 if (tag == 'INPUT' || tag == 'TEXTAREA') {
                     obj.val(val);
                 } else if (tag == 'SELECT') {
-                    if (val && val.indexOf('option')) {
+                    if (val && val.indexOf('option') != -1) {
                         obj.append(val);
                     } else {
                         var option = obj.find('option[value="' + val + '"]');

src/assets/src/js/jquery.multipleInput.min.js

@@ -222,14 +222,15 @@ public function renderCellContent($column, $index)
         }
 
         $hasError = false;
+        $error = '';
 
         if ($index !== null) {
             $error = $column->getFirstError($index);
             $hasError = !empty($error);
+        }
 
-            if ($column->enableError) {
-                $input .= "\n" . $column->renderError($error);
-            }
+        if ($column->enableError) {
+            $input .= "\n" . $column->renderError($error);
         }
 
         $wrapperOptions = [
@@ -313,4 +314,4 @@ protected function prepareTemplate()
     {
         return $this->renderRowContent();
     }
-}
+}