diff options
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/carousel.js | 9 | ||||
| -rw-r--r-- | js/src/collapse.js | 6 | ||||
| -rw-r--r-- | js/src/modal.js | 6 | ||||
| -rw-r--r-- | js/src/popover.js | 3 | ||||
| -rw-r--r-- | js/src/tooltip.js | 7 |
5 files changed, 11 insertions, 20 deletions
diff --git a/js/src/carousel.js b/js/src/carousel.js index 509f7ca9d..a5451538c 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) @@ -478,13 +478,10 @@ class Carousel { EventHandler .one(activeElement, TRANSITION_END, () => { - nextElement.classList.remove(directionalClassName) - nextElement.classList.remove(orderClassName) + nextElement.classList.remove(directionalClassName, orderClassName) nextElement.classList.add(CLASS_NAME_ACTIVE) - activeElement.classList.remove(CLASS_NAME_ACTIVE) - activeElement.classList.remove(orderClassName) - activeElement.classList.remove(directionalClassName) + activeElement.classList.remove(CLASS_NAME_ACTIVE, orderClassName, directionalClassName) this._isSliding = false diff --git a/js/src/collapse.js b/js/src/collapse.js index fde3e0a9e..4529a85ec 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -192,8 +192,7 @@ class Collapse { const complete = () => { this._element.classList.remove(CLASS_NAME_COLLAPSING) - this._element.classList.add(CLASS_NAME_COLLAPSE) - this._element.classList.add(CLASS_NAME_SHOW) + this._element.classList.add(CLASS_NAME_COLLAPSE, CLASS_NAME_SHOW) this._element.style[dimension] = '' @@ -230,8 +229,7 @@ class Collapse { reflow(this._element) this._element.classList.add(CLASS_NAME_COLLAPSING) - this._element.classList.remove(CLASS_NAME_COLLAPSE) - this._element.classList.remove(CLASS_NAME_SHOW) + this._element.classList.remove(CLASS_NAME_COLLAPSE, CLASS_NAME_SHOW) const triggerArrayLength = this._triggerArray.length if (triggerArrayLength > 0) { diff --git a/js/src/modal.js b/js/src/modal.js index ca77359ca..d5f1c8c9a 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -60,7 +60,6 @@ const EVENT_MOUSEUP_DISMISS = `mouseup.dismiss${EVENT_KEY}` const EVENT_MOUSEDOWN_DISMISS = `mousedown.dismiss${EVENT_KEY}` const EVENT_CLICK_DATA_API = `click${EVENT_KEY}${DATA_API_KEY}` -const CLASS_NAME_SCROLLABLE = 'modal-dialog-scrollable' const CLASS_NAME_SCROLLBAR_MEASURER = 'modal-scrollbar-measure' const CLASS_NAME_BACKDROP = 'modal-backdrop' const CLASS_NAME_OPEN = 'modal-open' @@ -249,11 +248,10 @@ class Modal { this._element.style.display = 'block' this._element.removeAttribute('aria-hidden') this._element.setAttribute('aria-modal', true) + this._element.scrollTop = 0 - if (this._dialog.classList.contains(CLASS_NAME_SCROLLABLE) && modalBody) { + if (modalBody) { modalBody.scrollTop = 0 - } else { - this._element.scrollTop = 0 } if (transition) { diff --git a/js/src/popover.js b/js/src/popover.js index 2d423f0dd..4aac7e8ab 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -113,8 +113,7 @@ class Popover extends Tooltip { this.setElementContent(SelectorEngine.findOne(SELECTOR_CONTENT, tip), content) - tip.classList.remove(CLASS_NAME_FADE) - tip.classList.remove(CLASS_NAME_SHOW) + tip.classList.remove(CLASS_NAME_FADE, CLASS_NAME_SHOW) } _addAttachmentClass(attachment) { diff --git a/js/src/tooltip.js b/js/src/tooltip.js index c493b15ee..3f40b3da1 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -400,8 +400,7 @@ class Tooltip { setContent() { const tip = this.getTipElement() this.setElementContent(SelectorEngine.findOne(SELECTOR_TOOLTIP_INNER, tip), this.getTitle()) - tip.classList.remove(CLASS_NAME_FADE) - tip.classList.remove(CLASS_NAME_SHOW) + tip.classList.remove(CLASS_NAME_FADE, CLASS_NAME_SHOW) } setElementContent(element, content) { @@ -421,7 +420,7 @@ class Tooltip { element.appendChild(content) } } else { - element.innerText = content.textContent + element.textContent = content.textContent } return @@ -434,7 +433,7 @@ class Tooltip { element.innerHTML = content } else { - element.innerText = content + element.textContent = content } } |