Only hide modal on transitionend if the event originates from the mod…

…al; fixes twbs#13223
hnrch02 · Apr 25, 2014 · d5fb11f · d5fb11f
1 parent e0d1e40
commit d5fb11f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/js/modal.js b/js/modal.js
@@ -116,7 +116,10 @@
 
     $.support.transition && this.$element.hasClass('fade') ?
       this.$element
-        .one($.support.transition.end, $.proxy(this.hideModal, this))
+        .one($.support.transition.end, $.proxy(function (e) {
+          if (!$(e.target).is(this.$element)) return
+          this.hideModal()
+        }, this))
         .emulateTransitionEnd(300) :
       this.hideModal()
   }