From 701c6c6e77950ca2df6e4e89bdea8732983c1cdd Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 2 Dec 2020 06:45:15 +0200 Subject: [PATCH] Unbreak lines. (#32304) --- js/src/carousel.js | 4 ++-- js/src/collapse.js | 6 ++---- js/src/dropdown.js | 9 +++++---- js/src/modal.js | 9 ++------- js/src/popover.js | 8 ++++---- js/src/scrollspy.js | 7 ++----- js/src/tab.js | 17 ++++------------- js/src/tooltip.js | 35 +++++++++-------------------------- js/src/util/index.js | 6 ++---- 9 files changed, 32 insertions(+), 69 deletions(-) diff --git a/js/src/carousel.js b/js/src/carousel.js index 6443ef094a..9c6fb53ee0 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -397,6 +397,7 @@ class Carousel extends BaseComponent { _setActiveIndicatorElement(element) { if (this._indicatorsElement) { const indicators = SelectorEngine.find(SELECTOR_ACTIVE, this._indicatorsElement) + for (let i = 0; i < indicators.length; i++) { indicators[i].classList.remove(CLASS_NAME_ACTIVE) } @@ -431,8 +432,7 @@ class Carousel extends BaseComponent { _slide(direction, element) { const activeElement = SelectorEngine.findOne(SELECTOR_ACTIVE_ITEM, this._element) const activeElementIndex = this._getItemIndex(activeElement) - const nextElement = element || (activeElement && - this._getItemByDirection(direction, activeElement)) + const nextElement = element || (activeElement && this._getItemByDirection(direction, activeElement)) const nextElementIndex = this._getItemIndex(nextElement) const isCycling = Boolean(this._interval) diff --git a/js/src/collapse.js b/js/src/collapse.js index feff6c9178..0ad2b198e9 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -124,8 +124,7 @@ class Collapse extends BaseComponent { } show() { - if (this._isTransitioning || - this._element.classList.contains(CLASS_NAME_SHOW)) { + if (this._isTransitioning || this._element.classList.contains(CLASS_NAME_SHOW)) { return } @@ -212,8 +211,7 @@ class Collapse extends BaseComponent { } hide() { - if (this._isTransitioning || - !this._element.classList.contains(CLASS_NAME_SHOW)) { + if (this._isTransitioning || !this._element.classList.contains(CLASS_NAME_SHOW)) { return } diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 5b8ae06454..7b3bf5b4ec 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -367,8 +367,7 @@ class Dropdown extends BaseComponent { } static clearMenus(event) { - if (event && (event.button === RIGHT_MOUSE_BUTTON || - (event.type === 'keyup' && event.key !== TAB_KEY))) { + if (event && (event.button === RIGHT_MOUSE_BUTTON || (event.type === 'keyup' && event.key !== TAB_KEY))) { return } @@ -475,11 +474,13 @@ class Dropdown extends BaseComponent { let index = items.indexOf(event.target) - if (event.key === ARROW_UP_KEY && index > 0) { // Up + // Up + if (event.key === ARROW_UP_KEY && index > 0) { index-- } - if (event.key === ARROW_DOWN_KEY && index < items.length - 1) { // Down + // Down + if (event.key === ARROW_DOWN_KEY && index < items.length - 1) { index++ } diff --git a/js/src/modal.js b/js/src/modal.js index fdca482135..a9cf8ae6cf 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -136,11 +136,7 @@ class Modal extends BaseComponent { this._setEscapeEvent() this._setResizeEvent() - EventHandler.on(this._element, - EVENT_CLICK_DISMISS, - SELECTOR_DATA_DISMISS, - event => this.hide(event) - ) + EventHandler.on(this._element, EVENT_CLICK_DISMISS, SELECTOR_DATA_DISMISS, event => this.hide(event)) EventHandler.on(this._dialog, EVENT_MOUSEDOWN_DISMISS, () => { EventHandler.one(this._element, EVENT_MOUSEUP_DISMISS, event => { @@ -237,8 +233,7 @@ class Modal extends BaseComponent { const transition = this._element.classList.contains(CLASS_NAME_FADE) const modalBody = SelectorEngine.findOne(SELECTOR_MODAL_BODY, this._dialog) - if (!this._element.parentNode || - this._element.parentNode.nodeType !== Node.ELEMENT_NODE) { + if (!this._element.parentNode || this._element.parentNode.nodeType !== Node.ELEMENT_NODE) { // Don't move modal's DOM position document.body.appendChild(this._element) } diff --git a/js/src/popover.js b/js/src/popover.js index 97db9a3f7d..66dcb47b90 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -29,8 +29,9 @@ const Default = { content: '', template: '' + '

' + + '
' + + '' } const DefaultType = { @@ -118,8 +119,7 @@ class Popover extends Tooltip { } _getContent() { - return this._element.getAttribute('data-bs-content') || - this.config.content + return this._element.getAttribute('data-bs-content') || this.config.content } _cleanTipClass() { diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js index e3e5e76b97..a05e57d623 100644 --- a/js/src/scrollspy.js +++ b/js/src/scrollspy.js @@ -196,9 +196,7 @@ class ScrollSpy extends BaseComponent { _process() { const scrollTop = this._getScrollTop() + this._config.offset const scrollHeight = this._getScrollHeight() - const maxScroll = this._config.offset + - scrollHeight - - this._getOffsetHeight() + const maxScroll = this._config.offset + scrollHeight - this._getOffsetHeight() if (this._scrollHeight !== scrollHeight) { this.refresh() @@ -223,8 +221,7 @@ class ScrollSpy extends BaseComponent { for (let i = this._offsets.length; i--;) { const isActiveTarget = this._activeTarget !== this._targets[i] && scrollTop >= this._offsets[i] && - (typeof this._offsets[i + 1] === 'undefined' || - scrollTop < this._offsets[i + 1]) + (typeof this._offsets[i + 1] === 'undefined' || scrollTop < this._offsets[i + 1]) if (isActiveTarget) { this._activate(this._targets[i]) diff --git a/js/src/tab.js b/js/src/tab.js index 0e9755ea02..c8aac3be72 100644 --- a/js/src/tab.js +++ b/js/src/tab.js @@ -95,15 +95,11 @@ class Tab extends BaseComponent { relatedTarget: previous }) - if (showEvent.defaultPrevented || - (hideEvent !== null && hideEvent.defaultPrevented)) { + if (showEvent.defaultPrevented || (hideEvent !== null && hideEvent.defaultPrevented)) { return } - this._activate( - this._element, - listElement - ) + this._activate(this._element, listElement) const complete = () => { EventHandler.trigger(previous, EVENT_HIDDEN, { @@ -129,14 +125,9 @@ class Tab extends BaseComponent { SelectorEngine.children(container, SELECTOR_ACTIVE) const active = activeElements[0] - const isTransitioning = callback && - (active && active.classList.contains(CLASS_NAME_FADE)) + const isTransitioning = callback && (active && active.classList.contains(CLASS_NAME_FADE)) - const complete = () => this._transitionComplete( - element, - active, - callback - ) + const complete = () => this._transitionComplete(element, active, callback) if (active && isTransitioning) { const transitionDuration = getTransitionDurationFromElement(active) diff --git a/js/src/tooltip.js b/js/src/tooltip.js index 62b3388398..25599bb42f 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -72,8 +72,9 @@ const AttachmentMap = { const Default = { animation: true, template: '', + '
' + + '
' + + '', trigger: 'hover focus', title: '', delay: 0, @@ -196,10 +197,7 @@ class Tooltip extends BaseComponent { let context = Data.getData(event.delegateTarget, dataKey) if (!context) { - context = new this.constructor( - event.delegateTarget, - this._getDelegateConfig() - ) + context = new this.constructor(event.delegateTarget, this._getDelegateConfig()) Data.setData(event.delegateTarget, dataKey, context) } @@ -530,10 +528,7 @@ class Tooltip extends BaseComponent { triggers.forEach(trigger => { if (trigger === 'click') { - EventHandler.on(this._element, - this.constructor.Event.CLICK, - this.config.selector, - event => this.toggle(event) + EventHandler.on(this._element, this.constructor.Event.CLICK, this.config.selector, event => this.toggle(event) ) } else if (trigger !== TRIGGER_MANUAL) { const eventIn = trigger === TRIGGER_HOVER ? @@ -543,16 +538,8 @@ class Tooltip extends BaseComponent { this.constructor.Event.MOUSELEAVE : this.constructor.Event.FOCUSOUT - EventHandler.on(this._element, - eventIn, - this.config.selector, - event => this._enter(event) - ) - EventHandler.on(this._element, - eventOut, - this.config.selector, - event => this._leave(event) - ) + EventHandler.on(this._element, eventIn, this.config.selector, event => this._enter(event)) + EventHandler.on(this._element, eventOut, this.config.selector, event => this._leave(event)) } }) @@ -562,10 +549,7 @@ class Tooltip extends BaseComponent { } } - EventHandler.on(this._element.closest(`.${CLASS_NAME_MODAL}`), - 'hide.bs.modal', - this._hideModalHandler - ) + EventHandler.on(this._element.closest(`.${CLASS_NAME_MODAL}`), 'hide.bs.modal', this._hideModalHandler) if (this.config.selector) { this.config = { @@ -610,8 +594,7 @@ class Tooltip extends BaseComponent { ] = true } - if (context.getTipElement().classList.contains(CLASS_NAME_SHOW) || - context._hoverState === HOVER_STATE_SHOW) { + if (context.getTipElement().classList.contains(CLASS_NAME_SHOW) || context._hoverState === HOVER_STATE_SHOW) { context._hoverState = HOVER_STATE_SHOW return } diff --git a/js/src/util/index.js b/js/src/util/index.js index c7cb3176a4..874827b168 100644 --- a/js/src/util/index.js +++ b/js/src/util/index.js @@ -66,10 +66,7 @@ const getTransitionDurationFromElement = element => { } // Get transition-duration of the element - let { - transitionDuration, - transitionDelay - } = window.getComputedStyle(element) + let { transitionDuration, transitionDelay } = window.getComputedStyle(element) const floatTransitionDuration = Number.parseFloat(transitionDuration) const floatTransitionDelay = Number.parseFloat(transitionDelay) @@ -96,6 +93,7 @@ const emulateTransitionEnd = (element, duration) => { let called = false const durationPadding = 5 const emulatedDuration = duration + durationPadding + function listener() { called = true element.removeEventListener(TRANSITION_END, listener)