some cleaning and changes for readability

1 files changed, 37 insertions, 39 deletions

diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index cf8b8e118..f428a79eb 100644
--- a/js/src/tooltip.js
+++ b/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
@@ -24,18 +24,18 @@ const CLASS_PREFIX       = 'bs-tooltip'
 const BSCLS_PREFIX_REGEX = new RegExp(`(^|\\s)${CLASS_PREFIX}\\S+`, 'g')
 
 const DefaultType = {
-  animation           : 'boolean',
-  template            : 'string',
-  title               : '(string|element|function)',
-  trigger             : 'string',
-  delay               : '(number|object)',
-  html                : 'boolean',
-  selector            : '(string|boolean)',
-  placement           : '(string|function)',
-  offset              : '(number|string)',
-  container           : '(string|element|boolean)',
-  fallbackPlacement   : '(string|array)',
-  boundary            : '(string|element)'
+  animation         : 'boolean',
+  template          : 'string',
+  title             : '(string|element|function)',
+  trigger           : 'string',
+  delay             : '(number|object)',
+  html              : 'boolean',
+  selector          : '(string|boolean)',
+  placement         : '(string|function)',
+  offset            : '(number|string)',
+  container         : '(string|element|boolean)',
+  fallbackPlacement : '(string|array)',
+  boundary          : '(string|element)'
 }
 
 const AttachmentMap = {
@@ -47,20 +47,20 @@ const AttachmentMap = {
 }
 
 const Default = {
-  animation           : true,
-  template            : '<div class="tooltip" role="tooltip">' +
-                      '<div class="arrow"></div>' +
-                      '<div class="tooltip-inner"></div></div>',
-  trigger             : 'hover focus',
-  title               : '',
-  delay               : 0,
-  html                : false,
-  selector            : false,
-  placement           : 'top',
-  offset              : 0,
-  container           : false,
-  fallbackPlacement   : 'flip',
-  boundary            : 'scrollParent'
+  animation         : true,
+  template          : '<div class="tooltip" role="tooltip">' +
+                    '<div class="arrow"></div>' +
+                    '<div class="tooltip-inner"></div></div>',
+  trigger           : 'hover focus',
+  title             : '',
+  delay             : 0,
+  html              : false,
+  selector          : false,
+  placement         : 'top',
+  offset            : 0,
+  container         : false,
+  fallbackPlacement : 'flip',
+  boundary          : 'scrollParent'
 }
 
 const HoverState = {
@@ -303,9 +303,7 @@ class Tooltip {
             this._handlePopperPlacementChange(data)
           }
         },
-        onUpdate: (data) => {
-          this._handlePopperPlacementChange(data)
-        }
+        onUpdate: (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) ||
-        context._hoverState === HoverState.SHOW) {
+    if ($(context.getTipElement()).hasClass(ClassName.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()