Skip to content

B
bootstrap
Commit 4e4e4563 authored by Heinrich Fenkart's avatar Heinrich Fenkart Committed by Chris Rebert
Browse files
Options

Fix #12845 - Modal#hide should only be called with an event argument 

Closes #12850
parent ead17b7c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
dist/js/bootstrap.js
View file @ 4e4e4563
...@@ -817,7 +817,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ...@@ -817,7 +817,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
} }
Modal.prototype.toggle = function (_relatedTarget) { Modal.prototype.toggle = function (_relatedTarget) {
return this[!this.isShown ? 'show' : 'hide'](_relatedTarget) return this.isShown ? this.hide() : this.show(_relatedTarget)
} }
Modal.prototype.show = function (_relatedTarget) { Modal.prototype.show = function (_relatedTarget) {
......
js/modal.js
View file @ 4e4e4563
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
} }
Modal.prototype.toggle = function (_relatedTarget) { Modal.prototype.toggle = function (_relatedTarget) {
return this[!this.isShown ? 'show' : 'hide'](_relatedTarget) return this.isShown ? this.hide() : this.show(_relatedTarget)
} }
Modal.prototype.show = function (_relatedTarget) { Modal.prototype.show = function (_relatedTarget) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment