diff --git a/js/src/carousel.js b/js/src/carousel.js index fdae81042..3350bdf55 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -119,7 +119,7 @@ class Carousel extends BaseComponent { this._config = this._getConfig(config) this._indicatorsElement = SelectorEngine.findOne(SELECTOR_INDICATORS, this._element) - this._touchSupported = isTouchEnabledDevice || navigator.maxTouchPoints > 0 + this._touchSupported = isTouchEnabledDevice() || navigator.maxTouchPoints > 0 this._pointerEvent = Boolean(window.PointerEvent) this._addEventListeners() diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 17041dfc2..5d208a86e 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -182,7 +182,7 @@ class Dropdown extends BaseComponent { // empty mouseover listeners to the body's immediate children; // only needed because of broken event delegation on iOS // https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html - if (isTouchEnabledDevice && !parent.closest(SELECTOR_NAVBAR_NAV)) { + if (isTouchEnabledDevice() && !parent.closest(SELECTOR_NAVBAR_NAV)) { [].concat(...document.body.children).forEach(element => { EventHandler.on(element, 'mouseover', null, noop) }) @@ -382,7 +382,7 @@ class Dropdown extends BaseComponent { // If this is a touch-enabled device we remove the extra // empty mouseover listeners we added for iOS support - if (isTouchEnabledDevice) { + if (isTouchEnabledDevice()) { [].concat(...document.body.children).forEach(element => { EventHandler.off(element, 'mouseover', null, noop) }) diff --git a/js/src/tooltip.js b/js/src/tooltip.js index c52ceeace..1c45a9e89 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -299,7 +299,7 @@ class Tooltip extends BaseComponent { // empty mouseover listeners to the body's immediate children; // only needed because of broken event delegation on iOS // https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html - if (isTouchEnabledDevice) { + if (isTouchEnabledDevice()) { [].concat(...document.body.children).forEach(element => { EventHandler.on(element, 'mouseover', noop) }) @@ -356,7 +356,7 @@ class Tooltip extends BaseComponent { // If this is a touch-enabled device we remove the extra // empty mouseover listeners we added for iOS support - if (isTouchEnabledDevice) { + if (isTouchEnabledDevice()) { [].concat(...document.body.children).forEach(element => { EventHandler.off(element, 'mouseover', noop) }) diff --git a/js/src/util/index.js b/js/src/util/index.js index 1a8b75d8f..d5d3c6883 100644 --- a/js/src/util/index.js +++ b/js/src/util/index.js @@ -204,7 +204,7 @@ const defineJQueryPlugin = (name, plugin) => { }) } -const isTouchEnabledDevice = 'ontouchstart' in document.documentElement +const isTouchEnabledDevice = () => 'ontouchstart' in document.documentElement export { TRANSITION_END,