Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorXhmikosR <xhmikosr@gmail.com>2020-03-29 09:59:54 +0300
committerGitHub <noreply@github.com>2020-03-29 09:59:54 +0300
commite1f5d819c73ad66e6ec0480e75e5e08c815a633e (patch)
treeb23cb5cf3595f16d0e0592b38722e9aacce29edb /js
parented94976ea80cfe5fa2bd9b6a6913c78de8626045 (diff)
Remove `MSPointerEvent` and `ms-touch-action` in tests (#30463)
Diffstat (limited to 'js')
-rw-r--r--js/src/carousel.js2
-rw-r--r--js/tests/unit/carousel.spec.js9
2 files changed, 5 insertions, 6 deletions
diff --git a/js/src/carousel.js b/js/src/carousel.js
index 509f7ca9d8..3020974d38 100644
--- a/js/src/carousel.js
+++ b/js/src/carousel.js
@@ -118,7 +118,7 @@ class Carousel {
this._element = element
this._indicatorsElement = SelectorEngine.findOne(SELECTOR_INDICATORS, this._element)
this._touchSupported = 'ontouchstart' in document.documentElement || navigator.maxTouchPoints > 0
- this._pointerEvent = Boolean(window.PointerEvent || window.MSPointerEvent)
+ this._pointerEvent = Boolean(window.PointerEvent)
this._addEventListeners()
Data.setData(element, DATA_KEY, this)
diff --git a/js/tests/unit/carousel.spec.js b/js/tests/unit/carousel.spec.js
index a163f9ae41..be32d19d9b 100644
--- a/js/tests/unit/carousel.spec.js
+++ b/js/tests/unit/carousel.spec.js
@@ -5,12 +5,11 @@ import EventHandler from '../../src/dom/event-handler'
import { getFixture, clearFixture, createEvent, jQueryMock } from '../helpers/fixture'
describe('Carousel', () => {
- const { Simulator, PointerEvent, MSPointerEvent } = window
- const originWinPointerEvent = PointerEvent || MSPointerEvent
- const supportPointerEvent = Boolean(PointerEvent || MSPointerEvent)
+ const { Simulator, PointerEvent } = window
+ const originWinPointerEvent = PointerEvent
+ const supportPointerEvent = Boolean(PointerEvent)
- window.MSPointerEvent = null
- const cssStyleCarousel = '.carousel.pointer-event { -ms-touch-action: none; touch-action: none; }'
+ const cssStyleCarousel = '.carousel.pointer-event { touch-action: none; }'
const stylesCarousel = document.createElement('style')
stylesCarousel.type = 'text/css'