aboutsummaryrefslogtreecommitdiff
path: root/js/src/tab.js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-08-18 20:25:48 -0700
committerMark Otto <[email protected]>2015-08-18 20:25:48 -0700
commit1c19ded8c14cc9caca8ca2992834e2900dbbb4e5 (patch)
treeaecfad1ba54e89b6db1f72f20c991784768399e5 /js/src/tab.js
parent0df8fae72508fd9291ccce1fb915e7eac4f83a95 (diff)
parent8cfde5ef29756a433645c61b2ba8fec63caada78 (diff)
downloadbootstrap-1c19ded8c14cc9caca8ca2992834e2900dbbb4e5.tar.xz
bootstrap-1c19ded8c14cc9caca8ca2992834e2900dbbb4e5.zip
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Diffstat (limited to 'js/src/tab.js')
-rw-r--r--js/src/tab.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/src/tab.js b/js/src/tab.js
index 4d8d7dec8..9d793417a 100644
--- a/js/src/tab.js
+++ b/js/src/tab.js
@@ -77,7 +77,7 @@ const Tab = (($) => {
show() {
if (this._element.parentNode &&
- (this._element.parentNode.nodeType == Node.ELEMENT_NODE) &&
+ (this._element.parentNode.nodeType === Node.ELEMENT_NODE) &&
($(this._element).parent().hasClass(ClassName.ACTIVE))) {
return
}
@@ -157,7 +157,7 @@ const Tab = (($) => {
let isTransitioning = callback
&& Util.supportsTransitionEnd()
&& ((active && $(active).hasClass(ClassName.FADE))
- || !!$(container).find(Selector.FADE_CHILD)[0])
+ || Boolean($(container).find(Selector.FADE_CHILD)[0]))
let complete = $.proxy(
this._transitionComplete,