1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

Switch to Set#has()

This commit is contained in:
XhmikosR 2020-05-02 16:56:23 +03:00
parent 2e758f64cf
commit 6d7bc54d22
5 changed files with 15 additions and 16 deletions

View file

@ -55,7 +55,6 @@
"unicorn/prefer-node-remove": "off",
"unicorn/prefer-optional-catch-binding": "off",
"unicorn/prefer-query-selector": "off",
"unicorn/prefer-set-has": "off",
"unicorn/prevent-abbreviations": "off"
}
}

View file

@ -125,17 +125,17 @@ const getConfigByPluginKey = pluginKey => {
}
}
const utilObjects = [
const utilObjects = new Set([
'Util',
'Sanitizer'
]
])
const domObjects = [
const domObjects = new Set([
'Data',
'EventHandler',
'Manipulator',
'SelectorEngine'
]
])
const build = async plugin => {
console.log(`Building ${plugin} plugin...`)
@ -144,11 +144,11 @@ const build = async plugin => {
const pluginFilename = path.basename(bsPlugins[plugin])
let pluginPath = rootPath
if (utilObjects.includes(plugin)) {
if (utilObjects.has(plugin)) {
pluginPath = `${rootPath}/util/`
}
if (domObjects.includes(plugin)) {
if (domObjects.has(plugin)) {
pluginPath = `${rootPath}/dom/`
}

View file

@ -22,7 +22,7 @@ const customEvents = {
mouseenter: 'mouseover',
mouseleave: 'mouseout'
}
const nativeEvents = [
const nativeEvents = new Set([
'click',
'dblclick',
'mouseup',
@ -69,7 +69,7 @@ const nativeEvents = [
'error',
'abort',
'scroll'
]
])
/**
* ------------------------------------------------------------------------
@ -151,7 +151,7 @@ function normalizeParams(originalTypeEvent, handler, delegationFn) {
typeEvent = custom
}
const isNative = nativeEvents.includes(typeEvent)
const isNative = nativeEvents.has(typeEvent)
if (!isNative) {
typeEvent = originalTypeEvent
@ -273,7 +273,7 @@ const EventHandler = {
const $ = getjQuery()
const typeEvent = event.replace(stripNameRegex, '')
const inNamespace = event !== typeEvent
const isNative = nativeEvents.includes(typeEvent)
const isNative = nativeEvents.has(typeEvent)
let jQueryEvent
let bubbles = true

View file

@ -39,7 +39,7 @@ const DATA_KEY = 'bs.tooltip'
const EVENT_KEY = `.${DATA_KEY}`
const CLASS_PREFIX = 'bs-tooltip'
const BSCLS_PREFIX_REGEX = new RegExp(`(^|\\s)${CLASS_PREFIX}\\S+`, 'g')
const DISALLOWED_ATTRIBUTES = ['sanitize', 'allowList', 'sanitizeFn']
const DISALLOWED_ATTRIBUTES = new Set(['sanitize', 'allowList', 'sanitizeFn'])
const DefaultType = {
animation: 'boolean',
@ -679,7 +679,7 @@ class Tooltip {
const dataAttributes = Manipulator.getDataAttributes(this.element)
Object.keys(dataAttributes).forEach(dataAttr => {
if (DISALLOWED_ATTRIBUTES.includes(dataAttr)) {
if (DISALLOWED_ATTRIBUTES.has(dataAttr)) {
delete dataAttributes[dataAttr]
}
})

View file

@ -5,7 +5,7 @@
* --------------------------------------------------------------------------
*/
const uriAttrs = [
const uriAttrs = new Set([
'background',
'cite',
'href',
@ -14,7 +14,7 @@ const uriAttrs = [
'poster',
'src',
'xlink:href'
]
])
const ARIA_ATTRIBUTE_PATTERN = /^aria-[\w-]*$/i
@ -36,7 +36,7 @@ const allowedAttribute = (attr, allowedAttributeList) => {
const attrName = attr.nodeName.toLowerCase()
if (allowedAttributeList.includes(attrName)) {
if (uriAttrs.includes(attrName)) {
if (uriAttrs.has(attrName)) {
return Boolean(attr.nodeValue.match(SAFE_URL_PATTERN) || attr.nodeValue.match(DATA_URL_PATTERN))
}