Skip to content

Commit

Permalink
rewrite tab unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Johann-S authored and XhmikosR committed Jul 23, 2019
1 parent ac0733d commit 3446b63
Show file tree
Hide file tree
Showing 8 changed files with 601 additions and 628 deletions.
2 changes: 1 addition & 1 deletion build/build-plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const bsPlugins = {
Modal: path.resolve(__dirname, '../js/src/modal/modal.js'),
Popover: path.resolve(__dirname, '../js/src/popover/popover.js'),
ScrollSpy: path.resolve(__dirname, '../js/src/scrollspy/scrollspy.js'),
Tab: path.resolve(__dirname, '../js/src/tab.js'),
Tab: path.resolve(__dirname, '../js/src/tab/tab.js'),
Toast: path.resolve(__dirname, '../js/src/toast/toast.js'),
Tooltip: path.resolve(__dirname, '../js/src/tooltip/tooltip.js')
}
Expand Down
2 changes: 1 addition & 1 deletion js/index.esm.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import Dropdown from './src/dropdown/dropdown'
import Modal from './src/modal/modal'
import Popover from './src/popover/popover'
import ScrollSpy from './src/scrollspy/scrollspy'
import Tab from './src/tab'
import Tab from './src/tab/tab'
import Toast from './src/toast/toast'
import Tooltip from './src/tooltip/tooltip'

Expand Down
2 changes: 1 addition & 1 deletion js/index.umd.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import Dropdown from './src/dropdown/dropdown'
import Modal from './src/modal/modal'
import Popover from './src/popover/popover'
import ScrollSpy from './src/scrollspy/scrollspy'
import Tab from './src/tab'
import Tab from './src/tab/tab'
import Toast from './src/toast/toast'
import Tooltip from './src/tooltip/tooltip'

Expand Down
10 changes: 5 additions & 5 deletions js/src/tab.js → js/src/tab/tab.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import {
getTransitionDurationFromElement,
makeArray,
reflow
} from './util/index'
import Data from './dom/data'
import EventHandler from './dom/event-handler'
import SelectorEngine from './dom/selector-engine'
} from '../util/index'
import Data from '../dom/data'
import EventHandler from '../dom/event-handler'
import SelectorEngine from '../dom/selector-engine'

/**
* ------------------------------------------------------------------------
Expand Down Expand Up @@ -253,7 +253,7 @@ EventHandler.on(document, Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (
* ------------------------------------------------------------------------
* add .tab to jQuery only if jQuery is present
*/

/* istanbul ignore if */
if (typeof $ !== 'undefined') {
const JQUERY_NO_CONFLICT = $.fn[NAME]
$.fn[NAME] = Tab._jQueryInterface
Expand Down
Loading

0 comments on commit 3446b63

Please sign in to comment.