Merge pull request #139 from mkorablin/master

Check if animation properties are set on close
HubSpot · Nov 8, 2015 · bc33130 · bc33130
2 parents 1452a0e + 648c677
commit bc33130
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/coffee/vex.coffee b/coffee/vex.coffee
@@ -153,7 +153,9 @@ vexFactory = ($) ->
                 $('body').trigger 'vexAfterClose', options # Triggered on the body since $vexContent was removed
                 options.afterClose $vexContent, options if options.afterClose
 
-            if animationEndSupport
+            hasAnimation = $vex.css('animationName') != 'none' && $vex.css('animationDuration') != '0s'
+
+            if animationEndSupport && hasAnimation
                 unless beforeClose() is false
                     $vex
                         .unbind(vex.animationEndEvent).bind(vex.animationEndEvent, -> close())

diff --git a/js/vex.combined.min.js b/js/vex.combined.min.js
diff --git a/js/vex.js b/js/vex.js
@@ -117,7 +117,7 @@
         return true;
       },
       closeByID: function(id) {
-        var $vex, $vexContent, beforeClose, close, options;
+        var $vex, $vexContent, beforeClose, close, hasAnimation, options;
         $vexContent = vex.getVexByID(id);
         if (!$vexContent.length) {
           return;
@@ -137,7 +137,8 @@
             return options.afterClose($vexContent, options);
           }
         };
-        if (animationEndSupport) {
+        hasAnimation = $vex.css('animationName') !== 'none' && $vex.css('animationDuration') !== '0s';
+        if (animationEndSupport && hasAnimation) {
           if (beforeClose() !== false) {
             $vex.unbind(vex.animationEndEvent).bind(vex.animationEndEvent, function() {
               return close();