Merge pull request #513 from Patternslib/chrome-modal-fix

fix to modals for chrome 60 where the modal gets closed quicker than …

Author: pysailor

changes.md

@@ -3,7 +3,7 @@
 ## 2.1.1 - unreleased
 
 - pat-modal: Only add a panel-header to the first panel-content element within pat-modal, not everyone. Otherwise this may collide with pat-collapsible which also creates a panel-content class further down the DOM (pilz)
-
+- pat-modal: Fix an issue where chrome is so quick that a modal is closed before the actual injection call can be sent. 
 
 ## 2.1.0 - Jun. 26, 2017
 

src/pat/modal/modal.js

@@ -147,12 +147,23 @@ define([
                 utils.redraw(this.$el.find(".panel-body"));
             }
         },
-
         destroy: function() {
-            $(document).off(".pat-modal");
-            this.$el.remove();
-            $('body').removeClass("modal-active");
-        }
+            var $el = this.$el;
+            if ($el.find('form').hasClass('pat-inject') ) {
+                // if pat-inject in modal form, listen to patterns-inject-triggered and destroy first
+                // once that has been triggered
+                $('body').on( "patterns-inject-triggered", function() {
+                    $(document).off(".pat-modal");
+                    $el.remove();
+                    $('body').removeClass("modal-active");                
+                });
+            } else {
+                // if working without injection, destroy right away.
+                $(document).off(".pat-modal");
+                $el.remove();
+                $('body').removeClass("modal-active");                
+            }
+        }   
     });
 });