aboutsummaryrefslogtreecommitdiff
path: root/js/src/util.js
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2015-08-18 19:22:46 -0700
committerJacob Thornton <[email protected]>2015-08-18 19:22:46 -0700
commit18ff57a183ac141f70164be481ef703729bcdf0d (patch)
tree89c7c9204089f1c960ac25a56ff6588f797b451d /js/src/util.js
parentf1827e5f9c37e9a344a8f7dd8ed269e774e83fce (diff)
downloadbootstrap-18ff57a183ac141f70164be481ef703729bcdf0d.tar.xz
bootstrap-18ff57a183ac141f70164be481ef703729bcdf0d.zip
js tests passing + eslint
Diffstat (limited to 'js/src/util.js')
-rw-r--r--js/src/util.js46
1 files changed, 25 insertions, 21 deletions
diff --git a/js/src/util.js b/js/src/util.js
index 86bea6578..f4a584125 100644
--- a/js/src/util.js
+++ b/js/src/util.js
@@ -29,14 +29,14 @@ const Util = (($) => {
}
function isElement(obj) {
- return (obj[0] || obj).nodeType;
+ return (obj[0] || obj).nodeType
}
function getSpecialTransitionEndEvent() {
return {
bindType: transition.end,
delegateType: transition.end,
- handle: function (event) {
+ handle(event) {
if ($(event.target).is(this)) {
return event.handleObj.handler.apply(this, arguments)
}
@@ -51,7 +51,7 @@ const Util = (($) => {
let el = document.createElement('bootstrap')
- for (var name in TransitionEndEvent) {
+ for (let name in TransitionEndEvent) {
if (el.style[name] !== undefined) {
return { end: TransitionEndEvent[name] }
}
@@ -63,7 +63,7 @@ const Util = (($) => {
function transitionEndEmulator(duration) {
let called = false
- $(this).one(Util.TRANSITION_END, function () {
+ $(this).one(Util.TRANSITION_END, () => {
called = true
})
@@ -98,8 +98,9 @@ const Util = (($) => {
TRANSITION_END: 'bsTransitionEnd',
getUID(prefix) {
- do prefix += ~~(Math.random() * 1000000)
- while (document.getElementById(prefix))
+ do {
+ prefix += ~~(Math.random() * 1000000)
+ } while (document.getElementById(prefix))
return prefix
},
@@ -123,28 +124,31 @@ const Util = (($) => {
},
supportsTransitionEnd() {
- return !!transition
+ return Boolean(transition)
},
typeCheckConfig(componentName, config, configTypes) {
-
for (let property in configTypes) {
- let expectedTypes = configTypes[property]
- let value = config[property]
- let valueType
-
- if (value && isElement(value)) valueType = 'element'
- else valueType = toType(value)
-
- if (!new RegExp(expectedTypes).test(valueType)) {
- throw new Error(
- `${componentName.toUpperCase()}: ` +
- `Option "${property}" provided type "${valueType}" ` +
- `but expected type "${expectedTypes}".`)
+ if (configTypes.hasOwnProperty(property)) {
+ let expectedTypes = configTypes[property]
+ let value = config[property]
+ let valueType
+
+ if (value && isElement(value)) {
+ valueType = 'element'
+ } else {
+ valueType = toType(value)
+ }
+
+ if (!new RegExp(expectedTypes).test(valueType)) {
+ throw new Error(
+ `${componentName.toUpperCase()}: ` +
+ `Option "${property}" provided type "${valueType}" ` +
+ `but expected type "${expectedTypes}".`)
+ }
}
}
}
-
}
setTransitionEndSupport()