Merge branch 'hnrch02-modal-toggle'

7cf7e42c · Chris Rebert · fa4379de · 4e4e4563 · 7cf7e42c · 7cf7e42c
Commit 7cf7e42c authored 11 years ago by Chris Rebert
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 2 deletions
+2 -2
--- 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) {

--- 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) {