]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'eslint' of https://github.com/bardiharborow/bootstrap into bardiharboro...
authorMark Otto <markdotto@gmail.com>
Fri, 25 Nov 2016 22:59:28 +0000 (14:59 -0800)
committerMark Otto <markdotto@gmail.com>
Fri, 25 Nov 2016 22:59:28 +0000 (14:59 -0800)
1  2 
js/src/tab.js
js/tests/unit/tab.js

diff --cc js/src/tab.js
index 9dc33e4da3aa6899f770c9a5dfd29d61e01f9785,c5d205bcface2aed92e61d4b2565fbb1e52e74e8..e7e8f550f0d29036c905481d5781cb7ea5e0cdea
@@@ -181,7 -181,7 +181,7 @@@ const Tab = (($) => 
        if (active) {
          $(active).removeClass(ClassName.ACTIVE)
  
-         let dropdownChild = $(active.parentNode).find(
 -        const dropdownChild = $(active).find(
++        const dropdownChild = $(active.parentNode).find(
            Selector.DROPDOWN_ACTIVE_CHILD
          )[0]
  
Simple merge