diff options
| author | Chris Rebert <[email protected]> | 2014-03-16 20:24:59 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-03-16 20:24:59 -0700 |
| commit | 7cf7e42c67d51d9db50f8461d629d06bc0a7f331 (patch) | |
| tree | b0c6a39a7a9933840b4429c18ccfd9135e560907 | |
| parent | fa4379de080df1e628f09f3e5678a4d181684d01 (diff) | |
| parent | 4e4e4563418e44a2f73c6a4ec4299105824f7eda (diff) | |
| download | bootstrap-7cf7e42c67d51d9db50f8461d629d06bc0a7f331.tar.xz bootstrap-7cf7e42c67d51d9db50f8461d629d06bc0a7f331.zip | |
Merge branch 'hnrch02-modal-toggle'
| -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) { |