Skip to content

Commit

Permalink
rewrite carousel unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Johann-S committed Mar 27, 2019
1 parent d1c1bed commit f2e0f87
Show file tree
Hide file tree
Showing 4 changed files with 480 additions and 687 deletions.
2 changes: 1 addition & 1 deletion build/build-plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const bsPlugins = {
SelectorEngine: path.resolve(__dirname, '../js/src/dom/selectorEngine.js'),
Alert: path.resolve(__dirname, '../js/src/alert/alert.js'),
Button: path.resolve(__dirname, '../js/src/button/button.js'),
Carousel: path.resolve(__dirname, '../js/src/carousel.js'),
Carousel: path.resolve(__dirname, '../js/src/carousel/carousel.js'),
Collapse: path.resolve(__dirname, '../js/src/collapse.js'),
Dropdown: path.resolve(__dirname, '../js/src/dropdown.js'),
Modal: path.resolve(__dirname, '../js/src/modal.js'),
Expand Down
12 changes: 6 additions & 6 deletions js/src/carousel.js → js/src/carousel/carousel.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import {
reflow,
triggerTransitionEnd,
typeCheckConfig
} from './util/index'
import Data from './dom/data'
import EventHandler from './dom/eventHandler'
import Manipulator from './dom/manipulator'
import SelectorEngine from './dom/selectorEngine'
} from '../util/index'
import Data from '../dom/data'
import EventHandler from '../dom/eventHandler'
import Manipulator from '../dom/manipulator'
import SelectorEngine from '../dom/selectorEngine'

/**
* ------------------------------------------------------------------------
Expand Down Expand Up @@ -629,7 +629,7 @@ EventHandler.on(window, Event.LOAD_DATA_API, () => {
* ------------------------------------------------------------------------
* add .carousel to jQuery only if jQuery is present
*/

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

0 comments on commit f2e0f87

Please sign in to comment.