diff --git a/js/src/carousel.js b/js/src/carousel.js index 352b238490eab8a0a0ead11fe700ea5aaee8ddf4..8de7fd5ee4a12d5ca3476f5032552de92f8590dd 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -597,7 +597,7 @@ EventHandler EventHandler.on(window, Event.LOAD_DATA_API, () => { const carousels = Util.makeArray(SelectorEngine.find(Selector.DATA_RIDE)) for (let i = 0, len = carousels.length; i < len; i++) { - Carousel._carouselInterface.call(carousels[i], Data.getData(carousels[i], DATA_KEY)) + Carousel._carouselInterface(carousels[i], Data.getData(carousels[i], DATA_KEY)) } }) diff --git a/js/src/dom/data.js b/js/src/dom/data.js index 838e13a1ddb096c874fa7ec4e55237049b2c000b..2c11151257bd3cb2fed3a12aa83b3e5edbb15c0b 100644 --- a/js/src/dom/data.js +++ b/js/src/dom/data.js @@ -28,7 +28,7 @@ const Data = (() => { storeData[element.key.id] = data }, get(element, key) { - if (typeof element === 'undefined' || typeof element.key === 'undefined') { + if (!element || typeof element.key === 'undefined') { return null }