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
diff options
context:
space:
mode:
authorJohann-S <johann.servoire@gmail.com>2019-02-23 01:37:55 +0300
committerXhmikosR <xhmikosr@gmail.com>2019-02-26 14:04:04 +0300
commit8a37045b798fd66ede9c68774f9bb657e28d956a (patch)
tree35a1cf1b26701975f9732e99553e53fb295678c7 /js/src/toast.js
parent8affe84c722bc459e7152e57d36a4f515f537abf (diff)
move util in a util folder with the sanitizer
Diffstat (limited to 'js/src/toast.js')
-rw-r--r--js/src/toast.js23
1 files changed, 14 insertions, 9 deletions
diff --git a/js/src/toast.js b/js/src/toast.js
index 6e878e5c80..fba559197f 100644
--- a/js/src/toast.js
+++ b/js/src/toast.js
@@ -5,10 +5,16 @@
* --------------------------------------------------------------------------
*/
+import {
+ jQuery as $,
+ TRANSITION_END,
+ emulateTransitionEnd,
+ getTransitionDurationFromElement,
+ typeCheckConfig
+} from './util/index'
import Data from './dom/data'
import EventHandler from './dom/eventHandler'
import Manipulator from './dom/manipulator'
-import Util from './util'
/**
* ------------------------------------------------------------------------
@@ -104,10 +110,10 @@ class Toast {
this._element.classList.remove(ClassName.HIDE)
this._element.classList.add(ClassName.SHOWING)
if (this._config.animation) {
- const transitionDuration = Util.getTransitionDurationFromElement(this._element)
+ const transitionDuration = getTransitionDurationFromElement(this._element)
- EventHandler.one(this._element, Util.TRANSITION_END, complete)
- Util.emulateTransitionEnd(this._element, transitionDuration)
+ EventHandler.one(this._element, TRANSITION_END, complete)
+ emulateTransitionEnd(this._element, transitionDuration)
} else {
complete()
}
@@ -153,7 +159,7 @@ class Toast {
...typeof config === 'object' && config ? config : {}
}
- Util.typeCheckConfig(
+ typeCheckConfig(
NAME,
config,
this.constructor.DefaultType
@@ -179,10 +185,10 @@ class Toast {
this._element.classList.remove(ClassName.SHOW)
if (this._config.animation) {
- const transitionDuration = Util.getTransitionDurationFromElement(this._element)
+ const transitionDuration = getTransitionDurationFromElement(this._element)
- EventHandler.one(this._element, Util.TRANSITION_END, complete)
- Util.emulateTransitionEnd(this._element, transitionDuration)
+ EventHandler.one(this._element, TRANSITION_END, complete)
+ emulateTransitionEnd(this._element, transitionDuration)
} else {
complete()
}
@@ -221,7 +227,6 @@ class Toast {
* add .toast to jQuery only if jQuery is present
*/
-const $ = Util.jQuery
if (typeof $ !== 'undefined') {
const JQUERY_NO_CONFLICT = $.fn[NAME]
$.fn[NAME] = Toast._jQueryInterface