aboutsummaryrefslogtreecommitdiff
path: root/js/src/util.js
diff options
context:
space:
mode:
authorBardi Harborow <[email protected]>2016-11-22 01:36:00 +1100
committerBardi Harborow <[email protected]>2016-11-24 11:59:55 +1100
commitc2616fb74e6bdc0cd46a5678a2c5cffcbe422106 (patch)
treec9f2db3c292861301816f255bbe25b9b45fdd8b2 /js/src/util.js
parent26c16743fce73db5f85c9f16fe59242f876c5360 (diff)
downloadbootstrap-c2616fb74e6bdc0cd46a5678a2c5cffcbe422106.tar.xz
bootstrap-c2616fb74e6bdc0cd46a5678a2c5cffcbe422106.zip
Make JS compliant with the new ESLint rules.
Diffstat (limited to 'js/src/util.js')
-rw-r--r--js/src/util.js30
1 files changed, 13 insertions, 17 deletions
diff --git a/js/src/util.js b/js/src/util.js
index 5ddbbbf13..06424fbfe 100644
--- a/js/src/util.js
+++ b/js/src/util.js
@@ -27,7 +27,7 @@ const Util = (($) => {
// shoutout AngusCroll (https://goo.gl/pxwQGp)
function toType(obj) {
- return ({}).toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase()
+ return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase()
}
function isElement(obj) {
@@ -52,11 +52,13 @@ const Util = (($) => {
return false
}
- let el = document.createElement('bootstrap')
+ const el = document.createElement('bootstrap')
- for (let name in TransitionEndEvent) {
+ for (const name in TransitionEndEvent) {
if (el.style[name] !== undefined) {
- return { end: TransitionEndEvent[name] }
+ return {
+ end: TransitionEndEvent[name]
+ }
}
}
@@ -96,15 +98,14 @@ const Util = (($) => {
* --------------------------------------------------------------------------
*/
- let Util = {
+ const Util = {
TRANSITION_END: 'bsTransitionEnd',
getUID(prefix) {
do {
- /* eslint-disable no-bitwise */
+ // eslint-disable-next-line no-bitwise
prefix += ~~(Math.random() * MAX_UID) // "~~" acts like a faster Math.floor() here
- /* eslint-enable no-bitwise */
} while (document.getElementById(prefix))
return prefix
},
@@ -133,17 +134,12 @@ const Util = (($) => {
},
typeCheckConfig(componentName, config, configTypes) {
- for (let property in configTypes) {
+ for (const property in configTypes) {
if (configTypes.hasOwnProperty(property)) {
- let expectedTypes = configTypes[property]
- let value = config[property]
- let valueType
-
- if (value && isElement(value)) {
- valueType = 'element'
- } else {
- valueType = toType(value)
- }
+ const expectedTypes = configTypes[property]
+ const value = config[property]
+ const valueType = value && isElement(value) ?
+ 'element' : toType(value)
if (!new RegExp(expectedTypes).test(valueType)) {
throw new Error(