Merge branch 'hnrch02-modal-toggle'

cvrebert · cvrebert · commit 7cf7e42c67d5 · 2014-03-16T20:24:59.000-07:00
diff --git 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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -817,7 +817,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re`
`817`	`817`	`}`
`818`	`818`
`819`	`819`	`Modal.prototype.toggle = function (_relatedTarget) {`
`820`		`- return this[!this.isShown ? 'show' : 'hide'](_relatedTarget)`
	`820`	`+ return this.isShown ? this.hide() : this.show(_relatedTarget)`
`821`	`821`	`}`
`822`	`822`
`823`	`823`	`Modal.prototype.show = function (_relatedTarget) {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`Modal.prototype.toggle = function (_relatedTarget) {`
`39`		`- return this[!this.isShown ? 'show' : 'hide'](_relatedTarget)`
	`39`	`+ return this.isShown ? this.hide() : this.show(_relatedTarget)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`Modal.prototype.show = function (_relatedTarget) {`