some cleaning and changes for readability

js/src/alert.js

@@ -1,6 +1,3 @@
-import $ from 'jquery'
-import Util from './util'
-
 /**
  * --------------------------------------------------------------------------
  * Bootstrap (v4.1.3): alert.js
@@ -8,6 +5,9 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
+import $ from 'jquery'
+import Util from './util'
+
 /**
  * ------------------------------------------------------------------------
  * Constants

js/src/button.js

@@ -1,5 +1,3 @@
-import $ from 'jquery'
-
 /**
  * --------------------------------------------------------------------------
  * Bootstrap (v4.1.3): button.js
@@ -7,6 +5,8 @@ import $ from 'jquery'
  * --------------------------------------------------------------------------
  */
 
+import $ from 'jquery'
+
 /**
  * ------------------------------------------------------------------------
  * Constants

js/src/carousel.js

@@ -60,10 +60,7 @@ const Event = {
   TOUCHMOVE      : `touchmove${EVENT_KEY}`,
   TOUCHEND       : `touchend${EVENT_KEY}`,
   POINTERDOWN    : `pointerdown${EVENT_KEY}`,
-  POINTERMOVE    : `pointermove${EVENT_KEY}`,
   POINTERUP      : `pointerup${EVENT_KEY}`,
-  POINTERLEAVE   : `pointerleave${EVENT_KEY}`,
-  POINTERCANCEL  : `pointercancel${EVENT_KEY}`,
   DRAG_START     : `dragstart${EVENT_KEY}`,
   LOAD_DATA_API  : `load${EVENT_KEY}${DATA_API_KEY}`,
   CLICK_DATA_API : `click${EVENT_KEY}${DATA_API_KEY}`
@@ -280,7 +277,7 @@ class Carousel {
     }
 
     const start = (event) => {
-      if (this._pointerEvent && (event.originalEvent.pointerType === PointerType.TOUCH || event.originalEvent.pointerType === PointerType.PEN)) {
+      if (this._pointerEvent && PointerType[event.originalEvent.pointerType.toUpperCase()]) {
         this.touchStartX = event.originalEvent.clientX
       } else if (!this._pointerEvent) {
         this.touchStartX = event.originalEvent.touches[0].clientX
@@ -297,7 +294,7 @@ class Carousel {
     }
 
     const end = (event) => {
-      if (this._pointerEvent && (event.originalEvent.pointerType === PointerType.TOUCH || event.originalEvent.pointerType === PointerType.PEN)) {
+      if (this._pointerEvent && PointerType[event.originalEvent.pointerType.toUpperCase()]) {
         this.touchDeltaX = event.originalEvent.clientX - this.touchStartX
       }
 

js/src/collapse.js

@@ -1,6 +1,3 @@
-import $ from 'jquery'
-import Util from './util'
-
 /**
  * --------------------------------------------------------------------------
  * Bootstrap (v4.1.3): collapse.js
@@ -8,6 +5,9 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
+import $ from 'jquery'
+import Util from './util'
+
 /**
  * ------------------------------------------------------------------------
  * Constants
@@ -67,10 +67,11 @@ class Collapse {
     this._isTransitioning = false
     this._element         = element
     this._config          = this._getConfig(config)
-    this._triggerArray    = $.makeArray(document.querySelectorAll(
+    this._triggerArray    = [].slice.call(document.querySelectorAll(
       `[data-toggle="collapse"][href="#${element.id}"],` +
       `[data-toggle="collapse"][data-target="#${element.id}"]`
     ))
+
     const toggleList = [].slice.call(document.querySelectorAll(Selector.DATA_TOGGLE))
     for (let i = 0, len = toggleList.length; i < len; i++) {
       const elem = toggleList[i]
@@ -227,6 +228,7 @@ class Collapse {
       for (let i = 0; i < triggerArrayLength; i++) {
         const trigger = this._triggerArray[i]
         const selector = Util.getSelectorFromElement(trigger)
+
         if (selector !== null) {
           const $elem = $([].slice.call(document.querySelectorAll(selector)))
           if (!$elem.hasClass(ClassName.SHOW)) {
@@ -375,6 +377,7 @@ $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
   const $trigger = $(this)
   const selector = Util.getSelectorFromElement(this)
   const selectors = [].slice.call(document.querySelectorAll(selector))
+
   $(selectors).each(function () {
     const $target = $(this)
     const data    = $target.data(DATA_KEY)

js/src/dropdown.js

@@ -1,7 +1,3 @@
-import $ from 'jquery'
-import Popper from 'popper.js'
-import Util from './util'
-
 /**
  * --------------------------------------------------------------------------
  * Bootstrap (v4.1.3): dropdown.js
@@ -9,6 +5,10 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
+import $ from 'jquery'
+import Popper from 'popper.js'
+import Util from './util'
+
 /**
  * ------------------------------------------------------------------------
  * Constants
@@ -203,8 +203,8 @@ class Dropdown {
       relatedTarget: this._element
     }
     const showEvent = $.Event(Event.SHOW, relatedTarget)
-
     const parent = Dropdown._getParentFromElement(this._element)
+
     $(parent).trigger(showEvent)
 
     if (showEvent.isDefaultPrevented()) {
@@ -226,8 +226,8 @@ class Dropdown {
       relatedTarget: this._element
     }
     const hideEvent = $.Event(Event.HIDE, relatedTarget)
-
     const parent = Dropdown._getParentFromElement(this._element)
+
     $(parent).trigger(hideEvent)
 
     if (hideEvent.isDefaultPrevented()) {
@@ -287,6 +287,7 @@ class Dropdown {
   _getMenuElement() {
     if (!this._menu) {
       const parent = Dropdown._getParentFromElement(this._element)
+
       if (parent) {
         this._menu = parent.querySelector(Selector.MENU)
       }
@@ -382,6 +383,7 @@ class Dropdown {
     }
 
     const toggles = [].slice.call(document.querySelectorAll(Selector.DATA_TOGGLE))
+
     for (let i = 0, len = toggles.length; i < len; i++) {
       const parent = Dropdown._getParentFromElement(toggles[i])
       const context = $(toggles[i]).data(DATA_KEY)

js/src/modal.js

@@ -1,6 +1,3 @@
-import $ from 'jquery'
-import Util from './util'
-
 /**
  * --------------------------------------------------------------------------
  * Bootstrap (v4.1.3): modal.js
@@ -8,6 +5,9 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
+import $ from 'jquery'
+import Util from './util'
+
 /**
  * ------------------------------------------------------------------------
  * Constants

js/src/popover.js

@@ -1,6 +1,3 @@
-import $ from 'jquery'
-import Tooltip from './tooltip'
-
 /**
  * --------------------------------------------------------------------------
  * Bootstrap (v4.1.3): popover.js
@@ -8,6 +5,9 @@ import Tooltip from './tooltip'
  * --------------------------------------------------------------------------
  */
 
+import $ from 'jquery'
+import Tooltip from './tooltip'
+
 /**
  * ------------------------------------------------------------------------
  * Constants

js/src/scrollspy.js

@@ -1,6 +1,3 @@
-import $ from 'jquery'
-import Util from './util'
-
 /**
  * --------------------------------------------------------------------------
  * Bootstrap (v4.1.3): scrollspy.js
@@ -8,6 +5,9 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
+import $ from 'jquery'
+import Util from './util'
+
 /**
  * ------------------------------------------------------------------------
  * Constants
@@ -242,12 +242,9 @@ class ScrollSpy {
 
     this._clear()
 
-    let queries = this._selector.split(',')
+    const queries = this._selector
-    // eslint-disable-next-line arrow-body-style
+      .split(',')
-    queries = queries.map((selector) => {
+      .map((selector) => `${selector}[data-target="${target}"],${selector}[href="${target}"]`)
-      return `${selector}[data-target="${target}"],` +
-              `${selector}[href="${target}"]`
-    })
 
     const $link = $([].slice.call(document.querySelectorAll(queries.join(','))))
 
@@ -270,8 +267,9 @@ class ScrollSpy {
   }
 
   _clear() {
-    const nodes = [].slice.call(document.querySelectorAll(this._selector))
+    [].slice.call(document.querySelectorAll(this._selector))
-    $(nodes).filter(Selector.ACTIVE).removeClass(ClassName.ACTIVE)
+      .filter((node) => node.classList.contains(ClassName.ACTIVE))
+      .forEach((node) => node.classList.remove(ClassName.ACTIVE))
   }
 
   // Static
@@ -304,8 +302,8 @@ class ScrollSpy {
 
 $(window).on(Event.LOAD_DATA_API, () => {
   const scrollSpys = [].slice.call(document.querySelectorAll(Selector.DATA_SPY))
-
   const scrollSpysLength = scrollSpys.length
+
   for (let i = scrollSpysLength; i--;) {
     const $spy = $(scrollSpys[i])
     ScrollSpy._jQueryInterface.call($spy, $spy.data())

js/src/tab.js

@@ -1,6 +1,3 @@
-import $ from 'jquery'
-import Util from './util'
-
 /**
  * --------------------------------------------------------------------------
  * Bootstrap (v4.1.3): tab.js
@@ -8,6 +5,9 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
+import $ from 'jquery'
+import Util from './util'
+
 /**
  * ------------------------------------------------------------------------
  * Constants
@@ -141,17 +141,12 @@ class Tab {
   // Private
 
   _activate(element, container, callback) {
-    let activeElements
+    const activeElements = container && container.nodeName === 'UL'
-    if (container && container.nodeName === 'UL') {
+      ? $(container).find(Selector.ACTIVE_UL)
-      activeElements = $(container).find(Selector.ACTIVE_UL)
+      : $(container).children(Selector.ACTIVE)
-    } else {
-      activeElements = $(container).children(Selector.ACTIVE)
-    }
 
     const active = activeElements[0]
-    const isTransitioning = callback &&
+    const isTransitioning = callback && (active && $(active).hasClass(ClassName.FADE))
-      (active && $(active).hasClass(ClassName.FADE))
-
     const complete = () => this._transitionComplete(
       element,
       active,
@@ -195,11 +190,12 @@ class Tab {
     Util.reflow(element)
     $(element).addClass(ClassName.SHOW)
 
-    if (element.parentNode &&
+    if (element.parentNode && $(element.parentNode).hasClass(ClassName.DROPDOWN_MENU)) {
-        $(element.parentNode).hasClass(ClassName.DROPDOWN_MENU)) {
       const dropdownElement = $(element).closest(Selector.DROPDOWN)[0]
+
       if (dropdownElement) {
         const dropdownToggleList = [].slice.call(dropdownElement.querySelectorAll(Selector.DROPDOWN_TOGGLE))
+
         $(dropdownToggleList).addClass(ClassName.ACTIVE)
       }
 

js/src/toast.js

@@ -1,6 +1,3 @@
-import $ from 'jquery'
-import Util from './util'
-
 /**
  * --------------------------------------------------------------------------
  * Bootstrap (v4.1.3): toast.js
@@ -8,56 +5,58 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
-const Toast = (($) => {
+import $ from 'jquery'
-  /**
+import Util from './util'
+
+/**
  * ------------------------------------------------------------------------
  * Constants
  * ------------------------------------------------------------------------
  */
 
-  const NAME               = 'toast'
+const NAME               = 'toast'
-  const VERSION            = '4.1.3'
+const VERSION            = '4.1.3'
-  const DATA_KEY           = 'bs.toast'
+const DATA_KEY           = 'bs.toast'
-  const EVENT_KEY          = `.${DATA_KEY}`
+const EVENT_KEY          = `.${DATA_KEY}`
-  const JQUERY_NO_CONFLICT = $.fn[NAME]
+const JQUERY_NO_CONFLICT = $.fn[NAME]
 
-  const Event = {
+const Event = {
   CLICK_DISMISS : `click.dismiss${EVENT_KEY}`,
   HIDE          : `hide${EVENT_KEY}`,
   HIDDEN        : `hidden${EVENT_KEY}`,
   SHOW          : `show${EVENT_KEY}`,
   SHOWN         : `shown${EVENT_KEY}`
-  }
+}
 
-  const ClassName = {
+const ClassName = {
   FADE : 'fade',
   HIDE : 'hide',
   SHOW : 'show'
-  }
+}
 
-  const DefaultType = {
+const DefaultType = {
   animation : 'boolean',
   autohide  : 'boolean',
   delay     : 'number'
-  }
+}
 
-  const Default = {
+const Default = {
   animation : true,
   autohide  : true,
   delay     : 500
-  }
+}
 
-  const Selector = {
+const Selector = {
   DATA_DISMISS : '[data-dismiss="toast"]'
-  }
+}
 
-  /**
+/**
  * ------------------------------------------------------------------------
  * Class Definition
  * ------------------------------------------------------------------------
  */
 
-  class Toast {
+class Toast {
   constructor(element, config) {
     this._element = element
     this._config  = this._getConfig(config)
@@ -201,22 +200,19 @@ const Toast = (($) => {
       }
     })
   }
-  }
+}
 
-  /**
+/**
  * ------------------------------------------------------------------------
  * jQuery
  * ------------------------------------------------------------------------
  */
 
-  $.fn[NAME]             = Toast._jQueryInterface
+$.fn[NAME]             = Toast._jQueryInterface
-  $.fn[NAME].Constructor = Toast
+$.fn[NAME].Constructor = Toast
-  $.fn[NAME].noConflict  = () => {
+$.fn[NAME].noConflict  = () => {
   $.fn[NAME] = JQUERY_NO_CONFLICT
   return Toast._jQueryInterface
-  }
+}
-
-  return Toast
-})($)
 
 export default Toast

js/src/tooltip.js

@@ -1,7 +1,3 @@
-import $ from 'jquery'
-import Popper from 'popper.js'
-import Util from './util'
-
 /**
  * --------------------------------------------------------------------------
  * Bootstrap (v4.1.3): tooltip.js
@@ -9,6 +5,10 @@ import Util from './util'
  * --------------------------------------------------------------------------
  */
 
+import $ from 'jquery'
+import Popper from 'popper.js'
+import Util from './util'
+
 /**
  * ------------------------------------------------------------------------
  * Constants
@@ -303,9 +303,7 @@ class Tooltip {
             this._handlePopperPlacementChange(data)
           }
         },
-        onUpdate: (data) => {
+        onUpdate: (data) => this._handlePopperPlacementChange(data)
-          this._handlePopperPlacementChange(data)
-        }
       })
 
       $(tip).addClass(ClassName.SHOW)
@@ -510,19 +508,19 @@ class Tooltip {
 
   _fixTitle() {
     const titleType = typeof this.element.getAttribute('data-original-title')
-    if (this.element.getAttribute('title') ||
+
-        titleType !== 'string') {
+    if (this.element.getAttribute('title') || titleType !== 'string') {
       this.element.setAttribute(
         'data-original-title',
         this.element.getAttribute('title') || ''
       )
+
       this.element.setAttribute('title', '')
     }
   }
 
   _enter(event, context) {
     const dataKey = this.constructor.DATA_KEY
-
     context = context || $(event.currentTarget).data(dataKey)
 
     if (!context) {
@@ -539,8 +537,7 @@ class Tooltip {
       ] = true
     }
 
-    if ($(context.getTipElement()).hasClass(ClassName.SHOW) ||
+    if ($(context.getTipElement()).hasClass(ClassName.SHOW) || context._hoverState === HoverState.SHOW) {
-        context._hoverState === HoverState.SHOW) {
       context._hoverState = HoverState.SHOW
       return
     }
@@ -563,7 +560,6 @@ class Tooltip {
 
   _leave(event, context) {
     const dataKey = this.constructor.DATA_KEY
-
     context = context || $(event.currentTarget).data(dataKey)
 
     if (!context) {
@@ -673,9 +669,11 @@ class Tooltip {
   _fixTransition() {
     const tip = this.getTipElement()
     const initConfigAnimation = this.config.animation
+
     if (tip.getAttribute('x-placement') !== null) {
       return
     }
+
     $(tip).removeClass(ClassName.FADE)
     this.config.animation = false
     this.hide()

js/src/util.js

@@ -1,5 +1,3 @@
-import $ from 'jquery'
-
 /**
  * --------------------------------------------------------------------------
  * Bootstrap (v4.1.3): util.js
@@ -7,6 +5,7 @@ import $ from 'jquery'
  * --------------------------------------------------------------------------
  */
 
+import $ from 'jquery'
 
 /**
  * ------------------------------------------------------------------------