diff options
| author | Heinrich Fenkart <[email protected]> | 2014-02-26 02:04:38 +0100 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-03-16 20:24:33 -0700 |
| commit | 4e4e4563418e44a2f73c6a4ec4299105824f7eda (patch) | |
| tree | e25e5f6273e4dc9010ea1dd4d8e8d53c02836091 | |
| parent | ead17b7ca6342ceb39b614d7179b9031902ea63f (diff) | |
| download | bootstrap-4e4e4563418e44a2f73c6a4ec4299105824f7eda.tar.xz bootstrap-4e4e4563418e44a2f73c6a4ec4299105824f7eda.zip | |
Fix #12845 - Modal#hide should only be called with an event argument
Closes #12850
| -rw-r--r-- | dist/js/bootstrap.js | 2 | ||||
| -rw-r--r-- | js/modal.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 1bf7ffafa..b9ae0fc11 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -817,7 +817,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re } 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) { diff --git a/js/modal.js b/js/modal.js index 454d7d57a..ec358696f 100644 --- a/js/modal.js +++ b/js/modal.js @@ -36,7 +36,7 @@ } 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) { |