Skip to content

Commit e59576c

Browse files
Eugene ShakhsuvarovEugene Shakhsuvarov
Eugene Shakhsuvarov
authored and
Eugene Shakhsuvarov
committed
Merge branch 'javascript-semicolons' of github.com:fredden/magento2 into 2.4-develop-prs
2 parents 2e45de7 + d305e0e commit e59576c

File tree

7 files changed

+104
-104
lines changed

7 files changed

+104
-104
lines changed

‎lib/web/jquery/bootstrap/collapse.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ define([
201201
this._element.style[dimension] = '';
202202

203203
EventHandler.trigger(this._element, EVENT_SHOWN);
204-
}
204+
};
205205

206206
const capitalizedDimension = dimension[0].toUpperCase() + dimension.slice(1);
207207
const scrollSize = `scroll${capitalizedDimension}`;
@@ -246,7 +246,7 @@ define([
246246
this._element.classList.remove(CLASS_NAME_COLLAPSING);
247247
this._element.classList.add(CLASS_NAME_COLLAPSE);
248248
EventHandler.trigger(this._element, EVENT_HIDDEN);
249-
}
249+
};
250250

251251
this._element.style[dimension] = '';
252252

‎lib/web/jquery/bootstrap/dom/data.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ define([], function() {
1414
* ------------------------------------------------------------------------
1515
*/
1616

17-
const elementMap = new Map()
17+
const elementMap = new Map();
1818

1919
return {
2020
set: function (element, key, instance) {
2121
if (!elementMap.has(element)) {
2222
elementMap.set(element, new Map())
2323
}
2424

25-
const instanceMap = elementMap.get(element)
25+
const instanceMap = elementMap.get(element);
2626

2727
// make it clear we only want one instance per element
2828
// can be removed later when multiple key/instances are fine to be used
@@ -48,7 +48,7 @@ define([], function() {
4848
return
4949
}
5050

51-
const instanceMap = elementMap.get(element)
51+
const instanceMap = elementMap.get(element);
5252

5353
instanceMap.delete(key)
5454

‎lib/web/jquery/bootstrap/dom/event-handler.js

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ define([
1818
* ------------------------------------------------------------------------
1919
*/
2020

21-
const namespaceRegex = /[^.]*(?=\..*)\.|.*/
22-
const stripNameRegex = /\..*/
23-
const stripUidRegex = /::\d+$/
24-
const eventRegistry = {} // Events storage
25-
let uidEvent = 1
21+
const namespaceRegex = /[^.]*(?=\..*)\.|.*/;
22+
const stripNameRegex = /\..*/;
23+
const stripUidRegex = /::\d+$/;
24+
const eventRegistry = {}; // Events storage
25+
let uidEvent = 1;
2626
const customEvents = {
2727
mouseenter: 'mouseover',
2828
mouseleave: 'mouseout'
29-
}
30-
const customEventsRegex = /^(mouseenter|mouseleave)/i
29+
};
30+
const customEventsRegex = /^(mouseenter|mouseleave)/i;
3131
const nativeEvents = new Set([
3232
'click',
3333
'dblclick',
@@ -75,7 +75,7 @@ define([
7575
'error',
7676
'abort',
7777
'scroll'
78-
])
78+
]);
7979

8080
/**
8181
* ------------------------------------------------------------------------
@@ -88,7 +88,7 @@ define([
8888
}
8989

9090
function getEvent(element) {
91-
const uid = getUidEvent(element)
91+
const uid = getUidEvent(element);
9292

9393
element.uidEvent = uid
9494
eventRegistry[uid] = eventRegistry[uid] || {}
@@ -110,7 +110,7 @@ define([
110110

111111
function bootstrapDelegationHandler(element, selector, fn) {
112112
return function handler(event) {
113-
const domElements = element.querySelectorAll(selector)
113+
const domElements = element.querySelectorAll(selector);
114114

115115
for (let {target} = event; target && target !== this; target = target.parentNode) {
116116
for (let i = domElements.length; i--;) {
@@ -132,10 +132,10 @@ define([
132132
}
133133

134134
function findHandler(events, handler, delegationSelector = null) {
135-
const uidEventList = Object.keys(events)
135+
const uidEventList = Object.keys(events);
136136

137137
for (let i = 0, len = uidEventList.length; i < len; i++) {
138-
const event = events[uidEventList[i]]
138+
const event = events[uidEventList[i]];
139139

140140
if (event.originalHandler === handler && event.delegationSelector === delegationSelector) {
141141
return event
@@ -146,11 +146,11 @@ define([
146146
}
147147

148148
function normalizeParams(originalTypeEvent, handler, delegationFn) {
149-
const delegation = typeof handler === 'string'
150-
const originalHandler = delegation ? delegationFn : handler
149+
const delegation = typeof handler === 'string';
150+
const originalHandler = delegation ? delegationFn : handler;
151151

152-
let typeEvent = getTypeEvent(originalTypeEvent)
153-
const isNative = nativeEvents.has(typeEvent)
152+
let typeEvent = getTypeEvent(originalTypeEvent);
153+
const isNative = nativeEvents.has(typeEvent);
154154

155155
if (!isNative) {
156156
typeEvent = originalTypeEvent
@@ -178,7 +178,7 @@ define([
178178
return fn.call(this, event)
179179
}
180180
}
181-
}
181+
};
182182

183183
if (delegationFn) {
184184
delegationFn = wrapFn(delegationFn)
@@ -187,21 +187,21 @@ define([
187187
}
188188
}
189189

190-
const [delegation, originalHandler, typeEvent] = normalizeParams(originalTypeEvent, handler, delegationFn)
191-
const events = getEvent(element)
192-
const handlers = events[typeEvent] || (events[typeEvent] = {})
193-
const previousFn = findHandler(handlers, originalHandler, delegation ? handler : null)
190+
const [delegation, originalHandler, typeEvent] = normalizeParams(originalTypeEvent, handler, delegationFn);
191+
const events = getEvent(element);
192+
const handlers = events[typeEvent] || (events[typeEvent] = {});
193+
const previousFn = findHandler(handlers, originalHandler, delegation ? handler : null);
194194

195195
if (previousFn) {
196196
previousFn.oneOff = previousFn.oneOff && oneOff
197197

198198
return
199199
}
200200

201-
const uid = getUidEvent(originalHandler, originalTypeEvent.replace(namespaceRegex, ''))
201+
const uid = getUidEvent(originalHandler, originalTypeEvent.replace(namespaceRegex, ''));
202202
const fn = delegation ?
203203
bootstrapDelegationHandler(element, handler, delegationFn) :
204-
bootstrapHandler(element, handler)
204+
bootstrapHandler(element, handler);
205205

206206
fn.delegationSelector = delegation ? handler : null
207207
fn.originalHandler = originalHandler
@@ -213,7 +213,7 @@ define([
213213
}
214214

215215
function removeHandler(element, events, typeEvent, handler, delegationSelector) {
216-
const fn = findHandler(events[typeEvent], handler, delegationSelector)
216+
const fn = findHandler(events[typeEvent], handler, delegationSelector);
217217

218218
if (!fn) {
219219
return
@@ -224,11 +224,11 @@ define([
224224
}
225225

226226
function removeNamespacedHandlers(element, events, typeEvent, namespace) {
227-
const storeElementEvent = events[typeEvent] || {}
227+
const storeElementEvent = events[typeEvent] || {};
228228

229229
Object.keys(storeElementEvent).forEach(handlerKey => {
230230
if (handlerKey.includes(namespace)) {
231-
const event = storeElementEvent[handlerKey]
231+
const event = storeElementEvent[handlerKey];
232232

233233
removeHandler(element, events, typeEvent, event.originalHandler, event.delegationSelector)
234234
}
@@ -255,10 +255,10 @@ define([
255255
return
256256
}
257257

258-
const [delegation, originalHandler, typeEvent] = normalizeParams(originalTypeEvent, handler, delegationFn)
259-
const inNamespace = typeEvent !== originalTypeEvent
260-
const events = getEvent(element)
261-
const isNamespace = originalTypeEvent.startsWith('.')
258+
const [delegation, originalHandler, typeEvent] = normalizeParams(originalTypeEvent, handler, delegationFn);
259+
const inNamespace = typeEvent !== originalTypeEvent;
260+
const events = getEvent(element);
261+
const isNamespace = originalTypeEvent.startsWith('.');
262262

263263
if (typeof originalHandler !== 'undefined') {
264264
// Simplest case: handler is passed, remove that listener ONLY.
@@ -276,12 +276,12 @@ define([
276276
})
277277
}
278278

279-
const storeElementEvent = events[typeEvent] || {}
279+
const storeElementEvent = events[typeEvent] || {};
280280
Object.keys(storeElementEvent).forEach(keyHandlers => {
281-
const handlerKey = keyHandlers.replace(stripUidRegex, '')
281+
const handlerKey = keyHandlers.replace(stripUidRegex, '');
282282

283283
if (!inNamespace || originalTypeEvent.includes(handlerKey)) {
284-
const event = storeElementEvent[keyHandlers]
284+
const event = storeElementEvent[keyHandlers];
285285

286286
removeHandler(element, events, typeEvent, event.originalHandler, event.delegationSelector)
287287
}
@@ -293,16 +293,16 @@ define([
293293
return null
294294
}
295295

296-
const $ = getjQuery()
297-
const typeEvent = getTypeEvent(event)
298-
const inNamespace = event !== typeEvent
299-
const isNative = nativeEvents.has(typeEvent)
296+
const $ = getjQuery();
297+
const typeEvent = getTypeEvent(event);
298+
const inNamespace = event !== typeEvent;
299+
const isNative = nativeEvents.has(typeEvent);
300300

301-
let jQueryEvent
302-
let bubbles = true
303-
let nativeDispatch = true
304-
let defaultPrevented = false
305-
let evt = null
301+
let jQueryEvent;
302+
let bubbles = true;
303+
let nativeDispatch = true;
304+
let defaultPrevented = false;
305+
let evt = null;
306306

307307
if (inNamespace && $) {
308308
jQueryEvent = $.Event(event, args)

‎lib/web/jquery/bootstrap/dom/manipulator.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ define([], function() {
4646
return {}
4747
}
4848

49-
const attributes = {}
49+
const attributes = {};
5050

5151
Object.keys(element.dataset)
5252
.filter(key => key.startsWith('bs'))
5353
.forEach(key => {
54-
let pureKey = key.replace(/^bs/, '')
54+
let pureKey = key.replace(/^bs/, '');
5555
pureKey = pureKey.charAt(0).toLowerCase() + pureKey.slice(1, pureKey.length)
5656
attributes[pureKey] = normalizeData(element.dataset[key])
5757
})
@@ -64,7 +64,7 @@ define([], function() {
6464
},
6565

6666
offset: function(element) {
67-
const rect = element.getBoundingClientRect()
67+
const rect = element.getBoundingClientRect();
6868

6969
return {
7070
top: rect.top + window.pageYOffset,

‎lib/web/jquery/bootstrap/dom/selector-engine.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ define([
1919
* ------------------------------------------------------------------------
2020
*/
2121

22-
const NODE_TEXT = 3
22+
const NODE_TEXT = 3;
2323

2424
return {
2525
find: function(selector, element = document.documentElement) {
@@ -36,9 +36,9 @@ define([
3636
},
3737

3838
parents: function(element, selector) {
39-
const parents = []
39+
const parents = [];
4040

41-
let ancestor = element.parentNode
41+
let ancestor = element.parentNode;
4242

4343
while (ancestor && ancestor.nodeType === Node.ELEMENT_NODE && ancestor.nodeType !== NODE_TEXT) {
4444
if (ancestor.matches(selector)) {
@@ -52,7 +52,7 @@ define([
5252
},
5353

5454
prev: function(element, selector) {
55-
let previous = element.previousElementSibling
55+
let previous = element.previousElementSibling;
5656

5757
while (previous) {
5858
if (previous.matches(selector)) {
@@ -66,7 +66,7 @@ define([
6666
},
6767

6868
next: function(element, selector) {
69-
let next = element.nextElementSibling
69+
let next = element.nextElementSibling;
7070

7171
while (next) {
7272
if (next.matches(selector)) {
@@ -89,7 +89,7 @@ define([
8989
'details',
9090
'[tabindex]',
9191
'[contenteditable="true"]'
92-
].map(selector => `${selector}:not([tabindex^="-"])`).join(', ')
92+
].map(selector => `${selector}:not([tabindex^="-"])`).join(', ');
9393

9494
return this.find(focusables, element).filter(el => !isDisabled(el) && isVisible(el))
9595
}

‎lib/web/jquery/bootstrap/tab.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ define([
132132
EventHandler.trigger(this._element, EVENT_SHOWN, {
133133
relatedTarget: previous
134134
});
135-
}
135+
};
136136

137137
if (target) {
138138
this._activate(target, target.parentNode, complete);

0 commit comments

Comments
 (0)