From 94a5d87e15092b090aff70d0bae88d2ff406076e Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Wed, 10 Jun 2020 18:40:52 +0300
Subject: [PATCH] Unbreak short lines
---
js/src/alert.js | 3 +--
js/src/dom/event-handler.js | 50 +++++++++++++++++--------------------
js/src/dropdown.js | 6 +----
js/src/toast.js | 6 +----
js/src/tooltip.js | 6 +----
js/src/util/index.js | 29 +++++++++++----------
6 files changed, 41 insertions(+), 59 deletions(-)
diff --git a/js/src/alert.js b/js/src/alert.js
index 95eec5331f..03922e94c3 100644
--- a/js/src/alert.js
+++ b/js/src/alert.js
@@ -100,8 +100,7 @@ class Alert {
const transitionDuration = getTransitionDurationFromElement(element)
- EventHandler
- .one(element, TRANSITION_END, () => this._destroyElement(element))
+ EventHandler.one(element, TRANSITION_END, () => this._destroyElement(element))
emulateTransitionEnd(element, transitionDuration)
}
diff --git a/js/src/dom/event-handler.js b/js/src/dom/event-handler.js
index 82262fa5a8..b766778588 100644
--- a/js/src/dom/event-handler.js
+++ b/js/src/dom/event-handler.js
@@ -207,14 +207,13 @@ function removeHandler(element, events, typeEvent, handler, delegationSelector)
function removeNamespacedHandlers(element, events, typeEvent, namespace) {
const storeElementEvent = events[typeEvent] || {}
- Object.keys(storeElementEvent)
- .forEach(handlerKey => {
- if (handlerKey.indexOf(namespace) > -1) {
- const event = storeElementEvent[handlerKey]
+ Object.keys(storeElementEvent).forEach(handlerKey => {
+ if (handlerKey.indexOf(namespace) > -1) {
+ const event = storeElementEvent[handlerKey]
- removeHandler(element, events, typeEvent, event.originalHandler, event.delegationSelector)
- }
- })
+ removeHandler(element, events, typeEvent, event.originalHandler, event.delegationSelector)
+ }
+ })
}
const EventHandler = {
@@ -247,23 +246,21 @@ const EventHandler = {
}
if (isNamespace) {
- Object.keys(events)
- .forEach(elementEvent => {
- removeNamespacedHandlers(element, events, elementEvent, originalTypeEvent.slice(1))
- })
+ Object.keys(events).forEach(elementEvent => {
+ removeNamespacedHandlers(element, events, elementEvent, originalTypeEvent.slice(1))
+ })
}
const storeElementEvent = events[typeEvent] || {}
- Object.keys(storeElementEvent)
- .forEach(keyHandlers => {
- const handlerKey = keyHandlers.replace(stripUidRegex, '')
+ Object.keys(storeElementEvent).forEach(keyHandlers => {
+ const handlerKey = keyHandlers.replace(stripUidRegex, '')
- if (!inNamespace || originalTypeEvent.indexOf(handlerKey) > -1) {
- const event = storeElementEvent[keyHandlers]
+ if (!inNamespace || originalTypeEvent.indexOf(handlerKey) > -1) {
+ const event = storeElementEvent[keyHandlers]
- removeHandler(element, events, typeEvent, event.originalHandler, event.delegationSelector)
- }
- })
+ removeHandler(element, events, typeEvent, event.originalHandler, event.delegationSelector)
+ }
+ })
},
trigger(element, event, args) {
@@ -300,16 +297,15 @@ const EventHandler = {
})
}
- // merge custom informations in our event
+ // merge custom information in our event
if (typeof args !== 'undefined') {
- Object.keys(args)
- .forEach(key => {
- Object.defineProperty(evt, key, {
- get() {
- return args[key]
- }
- })
+ Object.keys(args).forEach(key => {
+ Object.defineProperty(evt, key, {
+ get() {
+ return args[key]
+ }
})
+ })
}
if (defaultPrevented) {
diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index 9653e32fa0..42137a1937 100644
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -262,11 +262,7 @@ class Dropdown {
...config
}
- typeCheckConfig(
- NAME,
- config,
- this.constructor.DefaultType
- )
+ typeCheckConfig(NAME, config, this.constructor.DefaultType)
return config
}
diff --git a/js/src/toast.js b/js/src/toast.js
index 4d63e14b52..623e897714 100644
--- a/js/src/toast.js
+++ b/js/src/toast.js
@@ -172,11 +172,7 @@ class Toast {
...typeof config === 'object' && config ? config : {}
}
- typeCheckConfig(
- NAME,
- config,
- this.constructor.DefaultType
- )
+ typeCheckConfig(NAME, config, this.constructor.DefaultType)
return config
}
diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index e0a5952991..d76679a6a0 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -708,11 +708,7 @@ class Tooltip {
config.content = config.content.toString()
}
- typeCheckConfig(
- NAME,
- config,
- this.constructor.DefaultType
- )
+ typeCheckConfig(NAME, config, this.constructor.DefaultType)
if (config.sanitize) {
config.template = sanitizeHtml(config.template, config.whiteList, config.sanitizeFn)
diff --git a/js/src/util/index.js b/js/src/util/index.js
index 59efa6655d..d9a975554c 100644
--- a/js/src/util/index.js
+++ b/js/src/util/index.js
@@ -110,21 +110,20 @@ const emulateTransitionEnd = (element, duration) => {
}
const typeCheckConfig = (componentName, config, configTypes) => {
- Object.keys(configTypes)
- .forEach(property => {
- 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(
- `${componentName.toUpperCase()}: ` +
- `Option "${property}" provided type "${valueType}" ` +
- `but expected type "${expectedTypes}".`)
- }
- })
+ Object.keys(configTypes).forEach(property => {
+ 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(
+ `${componentName.toUpperCase()}: ` +
+ `Option "${property}" provided type "${valueType}" ` +
+ `but expected type "${expectedTypes}".`)
+ }
+ })
}
const isVisible = element => {
--
GitLab