improvements

Author: Eugene Tupikov

CHANGELOG.md

@@ -1,10 +1,16 @@
 Yii2 multiple input change log
 ==============================
 
-1.0.5 under development
+1.1.1 under development
 -----------------------
 
-- Bug #17 display inline errors (unclead, mikbox74)
+1.1.0
+-----
+
+- Bug #17: display inline errors (unclead, mikbox74)
+- Enh #11: Improve js events (unclead)
+- Bug #16: correct use of defaultValue property (unclead)
+- code improvements (unclead)
 
 1.0.4
 --------------------

README.md

@@ -3,9 +3,10 @@ Yii2 widget for handle multiple inputs for an attribute of model
 
 [![Latest Stable Version](https://poser.pugx.org/unclead/yii2-multiple-input/v/stable)](https://packagist.org/packages/unclead/yii2-multiple-input) [![Total Downloads](https://poser.pugx.org/unclead/yii2-multiple-input/downloads)](https://packagist.org/packages/unclead/yii2-multiple-input) [![Latest Unstable Version](https://poser.pugx.org/unclead/yii2-multiple-input/v/unstable)](https://packagist.org/packages/unclead/yii2-multiple-input) [![License](https://poser.pugx.org/unclead/yii2-multiple-input/license)](https://packagist.org/packages/unclead/yii2-multiple-input)
 
-##Installation
-
+##Latest release
+The latest version of the extension is v1.1.0. Follow the [instruction](./UPGRADE.md) for upgrading from previous versions
 
+##Installation
 The preferred way to install this extension is through [composer](http://getcomposer.org/download/).
 
 Either run
@@ -161,13 +162,14 @@ For using widget as column input you may use the following code:
 
 ### JavaScript events
 This widget has following events:
- - `init`: triggered after initialization
- - `addNewRow`: triggered after new row insertion
- - `removeRow`: triggered after row removal
+ - `afterInit`: triggered after initialization
+ - `afterAddRow`: triggered after new row insertion
+ - `beforeDeleteRow`: triggered before the row removal
+ - `afterDeleteRow`: triggered after the row removal
 
 Example:
 ```js
-jQuery('#multiple-input').on('addNewRow', function() {
+jQuery('#multiple-input').on('afterAddRow', function() {
    //some code 
 });
 ```

UPGRADE.md

@@ -0,0 +1,18 @@
+Upgrading Instructions for yii2-multiple-widget
+===============================================
+
+!!!IMPORTANT!!!
+
+The following upgrading instructions are cumulative. That is,
+if you want to upgrade from version A to version C and there is
+version B between A and C, you need to following the instructions
+for both A and B.
+
+Upgrade from version less then 1.1.0
+------------------------------------
+
+After installing version 1.1.0 you have to rename js events following the next schema:
+
+- Event `init` rename to `afterInit` 
+- Event `addNewRow` rename to `afterAddRow`
+- Event `removeRow` rename to `afterDeleteRow` 

composer.json

@@ -8,7 +8,7 @@
         "yii2 multiple field"
     ],
     "type": "yii2-extension",
-    "version": "1.0.4",
+    "version": "1.1.0",
     "license": "BSD-3-Clause",
     "support": {
         "issues": "https://github.com/unclead/yii2-multiple-input/issues?state=open",

examples/views/example.php

@@ -4,43 +4,53 @@
 use unclead\widgets\MultipleInput;
 use unclead\widgets\examples\models\ExampleModel;
 use yii\helpers\Html;
+use nex\chosen\Chosen;
+use unclead\widgets\MultipleInputColumn;
 
 // Note: You have to install https://github.com/kartik-v/yii2-widget-datepicker for correct work an example
 use kartik\date\DatePicker;
 
-/* @var $this \yii\base\View */
+/* @var $this \yii\web\View */
 /* @var $model ExampleModel */
 ?>
 
 <?php $form = ActiveForm::begin([
     'enableAjaxValidation'      => true,
+//    'enableAjaxValidation'      => false,
     'enableClientValidation'    => false,
     'validateOnChange'          => false,
     'validateOnSubmit'          => true,
     'validateOnBlur'            => false,
 ]);?>
 
-<h3>Single column</h3>
+    <h3>Single column</h3>
 <?php
-    echo $form->field($model, 'emails')->widget(MultipleInput::className(), [
-        'limit' => 5
-    ])
-    ->label(false);
+//    echo $form->field($model, 'emails')->widget(MultipleInput::className(), [
+//        'limit' => 5
+//    ])
+//    ->label(false);
 ?>
 
-<h3>Multiple columns</h3>
+    <h3>Multiple columns</h3>
 <?= $form->field($model, 'schedule')->widget(MultipleInput::className(), [
+    'id' => 'schedule-wrapper',
     'limit' => 4,
     'columns' => [
         [
             'name'  => 'user_id',
-            'type'  => 'dropDownList',
+            'type'  => MultipleInputColumn::TYPE_DROPDOWN,
+            'enableError' => true,
             'title' => 'User',
-            'defaultValue' => 1,
+            'defaultValue' => 33,
             'items' => [
-                1 => 'User 1',
-                2 => 'User 2'
-            ]
+                '' => 'Select user',
+                31 => 'item 31',
+                32 => 'item 32',
+                33 => 'item 33',
+                34 => 'item 34',
+                35 => 'item 35',
+                36 => 'item 36',
+            ],
         ],
         [
             'name'  => 'day',
@@ -67,6 +77,8 @@
         [
             'name'  => 'priority',
             'title' => 'Priority',
+            'defaultValue' => 1,
+            'enableError' => true,
             'options' => [
                 'class' => 'input-priority'
             ]
@@ -80,9 +92,33 @@
             'headerOptions' => [
                 'style' => 'width: 70px;',
             ]
+        ],
+        [
+            'type' => 'checkbox',
+            'name' => 'enable',
+            'defaultValue' => 0
         ]
     ]
- ]);
+]);
 ?>
 <?= Html::submitButton('Update', ['class' => 'btn btn-success']);?>
-<?php ActiveForm::end();?>
+<?php ActiveForm::end();?>
+
+
+<?php
+$js = <<< JS
+        $('#schedule-wrapper').on('afterInit', function(){
+            console.log('calls on after initialization event');
+        }).on('beforeAddRow', function(e) {
+            console.log('calls on before add row event');
+        }).on('afterAddRow', function(e) {
+            console.log('calls on after add row event');
+        }).on('beforeDeleteRow', function(){
+            console.log('calls on before remove row event');
+            return confirm('Are you sure you want to delete row?')
+        }).on('afterDeleteRow', function(){
+            console.log('calls on after remove row event');
+        });
+JS;
+
+$this->registerJs($js);

src/MultipleInput.php

@@ -62,11 +62,6 @@ class MultipleInput extends InputWidget
      */
     protected $jsTemplates = [];
 
-    /**
-     * @var string
-     */
-    private $replacementKeys;
-
     /**
      * Initialization.
      *
@@ -216,14 +211,7 @@ private function renderRowContent($index = null, $data = null)
         $hiddenInputs = [];
         foreach ($this->columns as $columnIndex => $column) {
             /* @var $column MultipleInputColumn */
-            if (is_null($index)) {
-                $value = 'multiple-' . $column->name . '-value';
-                $this->replacementKeys[$value] = $column->defaultValue;
-                $value = '{' . $value . '}';
-            } else {
-                $value = $column->prepareValue($data);
-            }
-
+            $value = $column->prepareValue($data);
             if ($column->isHiddenInput()) {
                 $hiddenInputs[] = $column->renderCellContent($value, $index);
             } else {
@@ -273,7 +261,7 @@ private function collectJsTemplates()
     private function renderActionColumn($index = null)
     {
         if (is_null($index)) {
-            $action = '{multiple-btn-action}';
+            $action = self::ACTION_REMOVE;
             $type = '{multiple-btn-type}';
         } else {
             $action = $index == 0 ? self::ACTION_ADD : self::ACTION_REMOVE;
@@ -368,10 +356,8 @@ public function registerClientScript()
                 'id'                => $this->getId(),
                 'template'          => $this->renderRowContent(),
                 'jsTemplates'       => $this->jsTemplates,
-                'btnAction'         => self::ACTION_REMOVE,
                 'btnType'           => 'btn-danger',
                 'limit'             => $this->limit,
-                'replacement'       => $this->replacementKeys,
                 'attributeOptions'  => $this->attributeOptions,
             ]
         );