]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Revert "Use mousedown instead of click for backdrop click detection; fixes #13816" 14287/head
authorHeinrich Fenkart <hnrch02@gmail.com>
Wed, 30 Jul 2014 21:54:25 +0000 (23:54 +0200)
committerHeinrich Fenkart <hnrch02@gmail.com>
Wed, 30 Jul 2014 21:54:25 +0000 (23:54 +0200)
js/modal.js
js/tests/unit/modal.js

index fdefdd2c53e3739dcd6617914f2ef9085c897526..92eff470ad1b553ca874ceeb943a39bcd85b0c96 100644 (file)
       this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
         .appendTo(this.$body)
 
-      this.$element.on('mousedown.dismiss.bs.modal', $.proxy(function (e) {
+      this.$element.on('click.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 6c48ed44b4bbe949f70add039b67e1fa594a4e4c..2262465a4b54ee31ac5920c3bc0393572bd10b7a 100644 (file)
@@ -141,7 +141,7 @@ $(function () {
         notEqual($('#modal-test').length, 0, 'modal insterted into dom')
         $('.contents').click()
         ok($('#modal-test').is(':visible'), 'modal visible')
-        $('#modal-test').mousedown()
+        $('#modal-test').click()
       })
       .on('hidden.bs.modal', function () {
         ok(!$('#modal-test').is(':visible'), 'modal hidden')
@@ -196,7 +196,7 @@ $(function () {
     $('<div id="modal-test"><div class="contents"/></div>')
       .on('shown.bs.modal', function () {
         triggered = 0
-        $('#modal-test').mousedown()
+        $('#modal-test').click()
       })
       .on('hide.bs.modal', function () {
         triggered += 1