]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Use mousedown instead of click for backdrop click detection; fixes #13816 13855/head
authorHeinrich Fenkart <hnrch02@gmail.com>
Wed, 18 Jun 2014 22:50:25 +0000 (00:50 +0200)
committerHeinrich Fenkart <hnrch02@gmail.com>
Tue, 1 Jul 2014 00:53:57 +0000 (02:53 +0200)
js/modal.js
js/tests/unit/modal.js

index 29eedf117ad2ac1368ebba585e70fc247bf14a2c..060ea6b825a795321b5bf1ab977217d67f4e902d 100644 (file)
       this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
         .appendTo(this.$body)
 
-      this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
+      this.$element.on('mousedown.dismiss.bs.modal', $.proxy(function (e) {
         if (e.target !== e.currentTarget) return
         this.options.backdrop == 'static'
           ? this.$element[0].focus.call(this.$element[0])
index a415129aaef07cb8f9d2bc12415cc86899f70e43..35a92a33b31d70661611f5a5828e04c4fa6f3b05 100644 (file)
@@ -154,7 +154,7 @@ $(function () {
         ok($('#modal-test').length, 'modal insterted into dom')
         $('.contents').click()
         ok($('#modal-test').is(':visible'), 'modal visible')
-        $('#modal-test').click()
+        $('#modal-test').mousedown()
       })
       .on('hidden.bs.modal', function () {
         ok(!$('#modal-test').is(':visible'), 'modal hidden')
@@ -174,7 +174,7 @@ $(function () {
     div
       .on('shown.bs.modal', function () {
         triggered = 0
-        $('#modal-test').click()
+        $('#modal-test').mousedown()
       })
       .on('hide.bs.modal', function () {
         triggered += 1