diff options
| author | Jacob <[email protected]> | 2014-07-06 00:01:57 -0700 |
|---|---|---|
| committer | Jacob <[email protected]> | 2014-07-06 00:01:57 -0700 |
| commit | 5830febd9a37bc147ae5f368607e5dcdc562ddf9 (patch) | |
| tree | fa0f284923b1135a9e17c335d4a3a7f380773897 | |
| parent | fc29dfab1b267cfefee3652cb175ca736b6ede6b (diff) | |
| parent | 121bf6633e8704df0d69a1e44a6fbbc2dbe6f8d2 (diff) | |
| download | bootstrap-5830febd9a37bc147ae5f368607e5dcdc562ddf9.tar.xz bootstrap-5830febd9a37bc147ae5f368607e5dcdc562ddf9.zip | |
Merge pull request #13855 from hnrch02/modal-mousedown
Use mousedown instead of click for backdrop click detection; fixes #13816
| -rw-r--r-- | js/modal.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/modal.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/js/modal.js b/js/modal.js index 92eff470a..fdefdd2c5 100644 --- a/js/modal.js +++ b/js/modal.js @@ -166,7 +166,7 @@ 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]) diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js index 5ee58616f..7a0660ea2 100644 --- a/js/tests/unit/modal.js +++ b/js/tests/unit/modal.js @@ -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') @@ -212,7 +212,7 @@ $(function () { div .on('shown.bs.modal', function () { triggered = 0 - $('#modal-test').click() + $('#modal-test').mousedown() }) .on('hide.bs.modal', function () { triggered += 1 |