#215 collect all js script that has to be evaluate when add new row (not only from " on ready" section)

Author: Eugene Tupikov

CHANGELOG.md

@@ -3,7 +3,7 @@ Yii2 multiple input change log
 
 2.17.0 (in development)
 =======================
-
+- #215 collect all js script that has to be evaluate when add new row (not only from " on ready" section)
 
 2.16.0
 ======

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

@@ -117,9 +117,7 @@
                 inputId = settings.inputId;
 
             for (i in settings.jsInit) {
-                var script = document.createElement("script");
-                script.innerHTML = settings.jsInit[i];
-                document.body.appendChild(script);
+                window.eval(settings.jsInit[i]);
             }
 
             $wrapper.data('multipleInput', {

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

@@ -339,7 +339,7 @@ public function render()
         $jsBefore= [];
         if (is_array($view->js)) {
             foreach ($view->js as $position => $scripts) {
-                foreach ($scripts as $key => $js) {
+                foreach ((array)$scripts as $key => $js) {
                     if (!isset($jsBefore[$position])) {
                         $jsBefore[$position] = [];
                     }
@@ -354,7 +354,7 @@ public function render()
         $jsInit = [];
         if (is_array($view->js)) {
             foreach ($view->js as $position => $scripts) {
-                foreach ($scripts as $key => $js) {
+                foreach ((array)$scripts as $key => $js) {
                     if (isset($jsBefore[$position][$key])) {
                         continue;
                     }
@@ -368,14 +368,15 @@ public function render()
         $template = $this->prepareTemplate();
 
         $jsTemplates = [];
-        if (is_array($view->js) && isset($view->js[View::POS_READY])) {
-            foreach ($view->js[View::POS_READY] as $key => $js) {
-                if (isset($jsBefore[View::POS_READY][$key])) {
-                    continue;
+        if (is_array($view->js)) {
+            foreach ($view->js as $position => $scripts) {
+                foreach ((array)$scripts as $key => $js) {
+                    if (isset($jsBefore[$position][$key])) {
+                        continue;
+                    }
+                    $jsTemplates[$key] = $js;
+                    unset($view->js[$position][$key]);
                 }
-
-                $jsTemplates[$key] = $js;
-                unset($view->js[View::POS_READY][$key]);
             }
         }
 
@@ -392,32 +393,41 @@ public function render()
         ]);
 
         $js = "jQuery('#{$this->id}').multipleInput($options);";
+        $view->registerJs($js);
 
-        if($this->sortable) {
-            MultipleInputSortableAsset::register($view);
-            $js .= <<<JS
-                $('#{$this->id} table').sorting({
-                    containerSelector: 'table',
-                    itemPath: '> tbody', 
-                    itemSelector: 'tr', 
-                    placeholder: '<tr class="placeholder">',
-                    handle:'.drag-handle',
-                    onDrop: function(item, container, _super, event) {
-                        _super(item, container, _super, event);
-                        
-                        var wrapper = item.closest('.multiple-input').first();
-                        event = $.Event('afterDropRow');
-                        wrapper.trigger(event, [item]);
-                    }
-                });
-JS;
+        if ($this->sortable) {
+            $this->registerJsSortable();
         }
 
-        $view->registerJs($js);
-
         return $content;
     }
 
+    private function registerJsSortable()
+    {
+        $view = $this->context->getView();
+        MultipleInputSortableAsset::register($view);
+
+        // todo override when ListRenderer will use div markup
+        $options = Json::encode([
+            'containerSelector' => 'table',
+            'itemPath'          => '> tbody',
+            'itemSelector'      => 'tr',
+            'placeholder'       => '<tr class="placeholder">',
+            'handle'            => '.drag-handle',
+            'onDrop'            => new \yii\web\JsExpression("
+                function(item, container, _super, event) {
+                    _super(item, container, _super, event);
+
+                    var wrapper = item.closest('.multiple-input').first();
+                    event = $.Event('afterDropRow');
+                    wrapper.trigger(event, [item]);
+                }
+            ")
+        ]);
+        $js = "$('#{$this->id} table').sorting($options);";
+        $view->registerJs($js);
+    }
+
     /**
      * @return mixed
      * @throws NotSupportedException