Using of an id instead of uniqueHash

Author: unclead

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

@@ -59,7 +59,6 @@
         min: 1,
         attributeOptions: {},
         indexPlaceholder: 'multiple_index',
-        uniqueHash: null
     };
 
     var defaultAttributeOptions = {
@@ -176,10 +175,9 @@
             data = $wrapper.data('multipleInput'),
             settings = data.settings,
             template = settings.template,
-            inputList = $wrapper.find('.multiple-input-list.' + settings.uniqueHash).first(),
-            count = $wrapper.find('.multiple-input-list__item.' + settings.uniqueHash).length;
+            inputList = $wrapper.children('.multiple-input-list').first();
 
-        if (settings.limit != null && count >= settings.limit) {
+        if (settings.limit != null && getCurrentIndex($wrapper) >= settings.limit) {
             return;
         }
 
@@ -250,10 +248,9 @@
         var $wrapper = $btn.closest('.multiple-input').first(),
             $toDelete = $btn.closest('.multiple-input-list__item'),
             data = $wrapper.data('multipleInput'),
-            settings = data.settings,
-            count = $('.multiple-input-list__item.' + settings.uniqueHash).length;
+            settings = data.settings;
 
-        if (count > settings.min) {
+        if (getCurrentIndex($wrapper) > settings.min) {
             var event = $.Event(events.beforeDeleteRow);
             $wrapper.trigger(event, [$toDelete]);
 
@@ -345,12 +342,10 @@
     };
 
     var getCurrentIndex = function($wrapper) {
-        if (typeof $wrapper.data('multipleInput') !== 'object') {
-            return 0;
-        }
-
         return $wrapper
-            .find('.multiple-input-list__item.' + $wrapper.data('multipleInput').settings.uniqueHash)
+            .children('.multiple-input-list')
+            .children('tbody')
+            .children('.multiple-input-list__item')
             .length;
     };
 

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

@@ -114,11 +114,6 @@ abstract class BaseRenderer extends Object
      * @var string
      */
     private $indexPlaceholder;
-
-    /**
-     * @var string
-     */
-    private $uniqueHash;
 
     /**
      * @param $context
@@ -265,8 +260,7 @@ protected function registerAssets()
             'limit'             => $this->limit,
             'min'               => $this->min,
             'attributeOptions'  => $this->attributeOptions,
-            'indexPlaceholder'  => $this->getIndexPlaceholder(),
-            'uniqueHash'        => $this->getUniqueHash()
+            'indexPlaceholder'  => $this->getIndexPlaceholder()
         ]);
 
         $js = "jQuery('#{$this->id}').multipleInput($options);";
@@ -305,14 +299,6 @@ public function getIndexPlaceholder()
         return $this->indexPlaceholder;
     }
 
-    /**
-     * @return string
-     */
-    public function getUniqueHash()
-    {
-        return $this->uniqueHash;
-    }
-
     /**
      * @return bool
      */
@@ -339,7 +325,6 @@ protected function isAddButtonPositionRow()
 
     private function prepareIndexPlaceholder()
     {
-        $this->uniqueHash = uniqid();
-        $this->indexPlaceholder = 'multiple-index-' . $this->uniqueHash;
+        $this->indexPlaceholder = 'multiple_index_' . $this->id;
     }
 }

src/components/BaseRenderer.php

@@ -37,7 +37,6 @@ protected function internalRender()
 
         $options = [];
         Html::addCssClass($options, 'multiple-input-list table table-condensed');
-        Html::addCssClass($options, $this->getUniqueHash());
 
         $content = Html::tag('table', implode("\n", $content), $options);
 
@@ -213,13 +212,12 @@ private function renderRowContent($index = null, $item = null)
     protected function prepareRowOptions($index, $item)
     {
         if (is_callable($this->rowOptions)) {
-            $options =call_user_func($this->rowOptions, $item, $index, $this->context);
+            $options = call_user_func($this->rowOptions, $item, $index, $this->context);
         } else {
             $options = $this->rowOptions;
         }
 
         Html::addCssClass($options, 'multiple-input-list__item');
-        Html::addCssClass($options, $this->getUniqueHash());
 
         return $options;
     }