vanilla_nested 1.5.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62b2d8f1c6e1c74ee3ade42bc1a96b311b008773cf2817742d3d859d255e256a
-  data.tar.gz: 52d1585917b4858208409fdf4c2c65d591ee8da58c823d56b57b83eb87d42f5e
+  metadata.gz: d7d2002ba8ba1ccf4f6e749969bff008be4a64f2a30d2e3ec011947d1cf0956e
+  data.tar.gz: e0a2d6e189be30823c4a68a95fbc48fb07c83fb1b02e1e46b4cfa1f8cf2c2323
 SHA512:
-  metadata.gz: d33496672d2818c8d9ae85503dfa136289ef1e709f3403e005313628cdd774d0af52182c02a5f22f6893e0e96de3846e8e9d3b928955ddbb5ee532c474bce1be
-  data.tar.gz: 1766822ad50b0046cc023d999d6f441f0cea3b15c3ecebcd0ffff5b9387c6d8aef2b959a5cbe84c1a674c4de88afff71d5dfb1ee2578b6bca1b72a1215c48a99
+  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,16 +37,14 @@
 
   // 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')
 
     const data = element.dataset;
     let wrapper = element.parentElement;
-    if (sel = data.fieldsWrapperSelector) wrapper = element.closest(sel);
+    const sel = data.fieldsWrapperSelector;
+    if (sel) wrapper = element.closest(sel);
 
     if (data.undoTimeout) {
       hideFieldsWithUndo(wrapper, element);
@@ -81,14 +72,28 @@
   // Unhides the children given a fields wrapper
   // "wrapper" is the wrapper of the link to remove fields
   function unhideFields(wrapper) {
-    [...wrapper.children].forEach(child => child.style.display = 'initial');
+    [...wrapper.children].forEach(child => {
+      if (child.dataset.hasAttributeStyle) {
+        child.style.display = child.dataset.originalDisplay;
+      } else {
+        child.removeAttribute("style");
+      }
+    });
   }
 
   // Hides an element and adds an "undo" link to unhide it
   // "wrapper" is the wrapper to hide
   // "element" is the link to remove the wrapper
   function hideFieldsWithUndo(wrapper, element) {
-    [...wrapper.children].forEach(child => child.style.display = 'none');
+    [...wrapper.children].forEach(child => {
+      // store original style for after undo
+      if (child.getAttribute("style")) {
+        child.dataset.hasAttributeStyle = true;
+        child.dataset.originalDisplay = child.style.display;
+      }
+
+      child.style.display = 'none';
+    });
 
     // add the 'undo' link with it's callback
     const undoLink = _createUndoWithElementsData(element.dataset);
@@ -129,7 +134,8 @@
     const undo = document.createElement('A');
 
     undo.classList.add('vanilla-nested-undo');
-    if (classes = data.undoLinkClasses)
+    const classes = data.undoLinkClasses;
+    if (classes)
       undo.classList.add(...classes.split(' '));
 
     undo.innerText = data.undoText;
@@ -138,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();
+    }
   })
 })()

data/lib/vanilla_nested.rb

@@ -9,5 +9,11 @@ module VanillaNested
         ActionView::Base.send :include, VanillaNested::ViewHelpers
       end
     end
+
+    initializer "vanilla_nested.assets" do
+      if Rails.application.config.respond_to?(:assets)
+        Rails.application.config.assets.precompile += %w( vanilla_nested.js )
+      end
+    end
   end
 end

metadata

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