From 4e4e4563418e44a2f73c6a4ec4299105824f7eda Mon Sep 17 00:00:00 2001 From: Heinrich Fenkart Date: Wed, 26 Feb 2014 02:04:38 +0100 Subject: [PATCH] Fix #12845 - Modal#hide should only be called with an event argument Closes #12850 --- dist/js/bootstrap.js | 2 +- js/modal.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 1bf7ffafa9..b9ae0fc11f 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 454d7d57a3..ec358696ff 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) {