vanilla_nested 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5058319d40fc1193fff7a37443ed4f295ae7c11bcf5d51540c50916441010fb0
-  data.tar.gz: ac1c6ed4857206ea7d24b3ef4ad873e2e1c1e1befdf57b286a361d561d9fe270
+  metadata.gz: d7d2002ba8ba1ccf4f6e749969bff008be4a64f2a30d2e3ec011947d1cf0956e
+  data.tar.gz: e0a2d6e189be30823c4a68a95fbc48fb07c83fb1b02e1e46b4cfa1f8cf2c2323
 SHA512:
-  metadata.gz: b336496c74a33d2b7771fe8b9e0579374a273e9461c9d755570d56fa760e82a407677a840eedf27fbe5b8772351b42de5809df8d841a61236af0b1ed60019798
-  data.tar.gz: 1ef398b2dfc1dae51001379360f1ad816e43df2d1fec24f40e4cd6fc869f65df75eab0da128aa66800d639d21c1eb9e74e68dba56888b3a4cdc37b915bf92925
+  metadata.gz: a35ecfef2084cc706603b16a2ec45088d1d061a5007ea98ba2643769e21e6c4ea24b7f80b2057bbf80e33c5c01b0cfc52c84312b3bc16a248f65329a8a0bcd18
+  data.tar.gz: 372d0a1a456a17cd339fa95dcb7b65a8d16c9940acee89aeb5a803f15af0e73ff757f93b85a756dbbe9a64cc25dc8142d203b2331c8dc6f7fe171679e4622ee1

data/app/assets/javascripts/vanilla_nested.js

@@ -1,10 +1,7 @@
 (function(){
   // Get the html from the data attribute and insert the new fields on the container
   // "event" is the click event of the link created by the rails helper
-  window.addVanillaNestedFields = function(event) {
-    event.preventDefault();
-
-    let element = event.target;
+  window.addVanillaNestedFields = function(element) {
     if (!element.classList.contains('vanilla-nested-add'))
       element = element.closest('.vanilla-nested-add')
 
@@ -30,10 +27,6 @@
 
     _dispatchEvent(container, 'vanilla-nested:fields-added', element, {added: inserted})
 
-    let removeLink = inserted.querySelector('.vanilla-nested-remove');
-    if (removeLink)
-      removeLink.addEventListener('click', removeVanillaNestedFields, true);
-
     // dispatch an event if we reached the limit configured on the model
     if (data.limit) {
       let nestedElements = container.querySelectorAll('[name$="[_destroy]"][value="0"]').length;
@@ -44,10 +37,7 @@
 
   // Removes the fields or hides them until the undo timer times out
   // "event" is the click event of the link created by the rails helper
-  window.removeVanillaNestedFields = function(event) {
-    event.preventDefault();
-
-    let element = event.target;
+  window.removeVanillaNestedFields = function(element) {
     if (!element.classList.contains('vanilla-nested-remove'))
       element = element.closest('.vanilla-nested-remove')
 
@@ -154,27 +144,34 @@
   }
 
   function initVanillaNested() {
-    document.querySelectorAll('.vanilla-nested-add').forEach(el => {
-      el.addEventListener('click', addVanillaNestedFields, true);
+    document.addEventListener('click', ev => {
+      const addVanillaNested =
+        ev.target.classList.contains('vanilla-nested-add') ||
+        ev.target.closest('.vanilla-nested-add');
+
+      if (addVanillaNested) {
+        ev.preventDefault();
+        addVanillaNestedFields(ev.target);
+      }
     })
 
-    document.querySelectorAll('.vanilla-nested-remove').forEach(el => {
-      el.addEventListener('click', removeVanillaNestedFields, true);
+    document.addEventListener('click', ev => {
+      const removeVanillaNested =
+        ev.target.classList.contains('vanilla-nested-remove') ||
+        ev.target.closest('.vanilla-nested-remove');
+
+      if (removeVanillaNested) {
+        ev.preventDefault();
+        removeVanillaNestedFields(ev.target);
+      }
     })
   }
 
+  let vanillaNestedInitialized = false;
   document.addEventListener('DOMContentLoaded', function(){
-    initVanillaNested();
-  })
-
-  // Don't run turbolinks/turbo event callback for first load, we already do it with DOMContentLoaded
-  const notEmpty = (obj) => Object.keys(obj).length;
-
-  document.addEventListener('turbolinks:load', function(e){
-    if (notEmpty(e.data.timing)) initVanillaNested();
-  })
-
-  document.addEventListener('turbo:load', function(e){
-    if (notEmpty(e.detail.timing)) initVanillaNested();
+    if (!vanillaNestedInitialized) {
+      vanillaNestedInitialized = true;
+      initVanillaNested();
+    }
   })
 })()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vanilla_nested
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Ariel Juodziukynas <arieljuod@gmail.com>