Merge b2a6f2b into 5eaff61

lowjoel · Mar 26, 2019 · 5907f02 · 5907f02
2 parents 5eaff61 + b2a6f2b
commit 5907f02
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/assets/javascripts/simple_form-bootstrap.js b/app/assets/javascripts/simple_form-bootstrap.js
@@ -18,11 +18,13 @@
     tokenfields.tokenfield();
   }
 
-  $(document).on('ready', function() {
+  $(function() {
     initializeComponents(document);
   });
   $(document).on('DOMNodeInserted', function(e) {
-    initializeComponents(e.target);
+    if (['FIELDSET', 'HTML'].indexOf(e.target.parentNode.tagName) === -1) {
+      initializeComponents(e.target)
+    }
   });
   $(document).on('nested:fieldAdded', function(e) {
     initializeComponents(e.field);

diff --git a/lib/simple_form/bootstrap/version.rb b/lib/simple_form/bootstrap/version.rb
@@ -1,4 +1,4 @@
 module SimpleForm; end
 module SimpleForm::Bootstrap
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end