Skip to content

Commit 2b44fa2

Browse files
krissyhiserotekrissyhiserote
committed
AC-99: Update Third Party library: jquery.tabs
- update const, let and arrow functions
1 parent 1ba94d5 commit 2b44fa2

File tree

8 files changed

+260
-295
lines changed

8 files changed

+260
-295
lines changed

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

Lines changed: 80 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -15,54 +15,54 @@ define([
1515
], function($, Util, Data, EventHandler, Manipulator, SelectorEngine) {
1616
'use strict';
1717

18-
var defineJQueryPlugin = Util.defineJQueryPlugin;
19-
var executeAfterTransition = Util.executeAfterTransition;
20-
var getElement = Util.getElement;
21-
var getSelectorFromElement = Util.getSelectorFromElement;
22-
var getElementFromSelector = Util.getElementFromSelector;
23-
var reflow = Util.reflow;
24-
var typeCheckConfig = Util.typeCheckConfig;
18+
const defineJQueryPlugin = Util.defineJQueryPlugin;
19+
const executeAfterTransition = Util.executeAfterTransition;
20+
const getElement = Util.getElement;
21+
const getSelectorFromElement = Util.getSelectorFromElement;
22+
const getElementFromSelector = Util.getElementFromSelector;
23+
const reflow = Util.reflow;
24+
const typeCheckConfig = Util.typeCheckConfig;
2525

2626
/**
2727
* ------------------------------------------------------------------------
2828
* Constants
2929
* ------------------------------------------------------------------------
3030
*/
3131

32-
var VERSION = '5.1.3'
33-
var NAME = 'collapse'
34-
var DATA_KEY = 'bs.collapse'
35-
var EVENT_KEY = `.${DATA_KEY}`
36-
var DATA_API_KEY = '.data-api'
32+
const VERSION = '5.1.3'
33+
const NAME = 'collapse'
34+
const DATA_KEY = 'bs.collapse'
35+
const EVENT_KEY = `.${DATA_KEY}`
36+
const DATA_API_KEY = '.data-api'
3737

38-
var Default = {
38+
const Default = {
3939
toggle: true,
4040
parent: null
4141
}
4242

43-
var DefaultType = {
43+
const DefaultType = {
4444
toggle: 'boolean',
4545
parent: '(null|element)'
4646
}
4747

48-
var EVENT_SHOW = `show${EVENT_KEY}`
49-
var EVENT_SHOWN = `shown${EVENT_KEY}`
50-
var EVENT_HIDE = `hide${EVENT_KEY}`
51-
var EVENT_HIDDEN = `hidden${EVENT_KEY}`
52-
var EVENT_CLICK_DATA_API = `click${EVENT_KEY}${DATA_API_KEY}`
48+
const EVENT_SHOW = `show${EVENT_KEY}`
49+
const EVENT_SHOWN = `shown${EVENT_KEY}`
50+
const EVENT_HIDE = `hide${EVENT_KEY}`
51+
const EVENT_HIDDEN = `hidden${EVENT_KEY}`
52+
const EVENT_CLICK_DATA_API = `click${EVENT_KEY}${DATA_API_KEY}`
5353

54-
var CLASS_NAME_SHOW = 'show'
55-
var CLASS_NAME_COLLAPSE = 'collapse'
56-
var CLASS_NAME_COLLAPSING = 'collapsing'
57-
var CLASS_NAME_COLLAPSED = 'collapsed'
58-
var CLASS_NAME_DEEPER_CHILDREN = `:scope .${CLASS_NAME_COLLAPSE} .${CLASS_NAME_COLLAPSE}`
59-
var CLASS_NAME_HORIZONTAL = 'collapse-horizontal'
54+
const CLASS_NAME_SHOW = 'show'
55+
const CLASS_NAME_COLLAPSE = 'collapse'
56+
const CLASS_NAME_COLLAPSING = 'collapsing'
57+
const CLASS_NAME_COLLAPSED = 'collapsed'
58+
const CLASS_NAME_DEEPER_CHILDREN = `:scope .${CLASS_NAME_COLLAPSE} .${CLASS_NAME_COLLAPSE}`
59+
const CLASS_NAME_HORIZONTAL = 'collapse-horizontal'
6060

61-
var WIDTH = 'width'
62-
var HEIGHT = 'height'
61+
const WIDTH = 'width'
62+
const HEIGHT = 'height'
6363

64-
var SELECTOR_ACTIVES = '.collapse.show, .collapse.collapsing'
65-
var SELECTOR_DATA_TOGGLE = '[data-bs-toggle="collapse"]'
64+
const SELECTOR_ACTIVES = '.collapse.show, .collapse.collapsing'
65+
const SELECTOR_DATA_TOGGLE = '[data-bs-toggle="collapse"]'
6666

6767
/**
6868
* ------------------------------------------------------------------------
@@ -84,16 +84,13 @@ define([
8484
this._config = this._getConfig(config)
8585
this._triggerArray = []
8686

87-
var toggleList = SelectorEngine.find(SELECTOR_DATA_TOGGLE)
87+
const toggleList = SelectorEngine.find(SELECTOR_DATA_TOGGLE)
8888

89-
var self = this;
90-
for (var i = 0, len = toggleList.length; i < len; i++) {
91-
var elem = toggleList[i]
92-
var selector = getSelectorFromElement(elem)
93-
var filterElement = SelectorEngine.find(selector)
94-
.filter(function(foundElem) {
95-
return foundElem === self._element
96-
})
89+
for (let i = 0, len = toggleList.length; i < len; i++) {
90+
const elem = toggleList[i]
91+
const selector = getSelectorFromElement(elem)
92+
const filterElement = SelectorEngine.find(selector)
93+
.filter(foundElem => foundElem === this._element)
9794

9895
if (selector !== null && filterElement.length) {
9996
this._selector = selector
@@ -127,10 +124,10 @@ define([
127124
// Public
128125

129126
Collapse.prototype.dispose = function() {
130-
Data.remove(this._element, Collapse.DATA_KEY)
131-
EventHandler.off(this._element, Collapse.EVENT_KEY)
127+
Data.remove(this._element, this.constructor.DATA_KEY)
128+
EventHandler.off(this._element, this.constructor.EVENT_KEY)
132129

133-
Object.getOwnPropertyNames(this).forEach(function(propertyName) {
130+
Object.getOwnPropertyNames(this).forEach(propertyName => {
134131
this[propertyName] = null
135132
})
136133
}
@@ -152,34 +149,30 @@ define([
152149
return
153150
}
154151

155-
var actives = []
156-
var activesData
152+
let actives = []
153+
let activesData
157154

158155
if (this._config.parent) {
159-
var children = SelectorEngine.find(CLASS_NAME_DEEPER_CHILDREN, this._config.parent)
160-
actives = SelectorEngine.find(SELECTOR_ACTIVES, this._config.parent).filter(function(elem) {
161-
return !children.includes(elem)
162-
}) // remove children if greater depth
156+
const children = SelectorEngine.find(CLASS_NAME_DEEPER_CHILDREN, this._config.parent)
157+
actives = SelectorEngine.find(SELECTOR_ACTIVES, this._config.parent).filter(elem => !children.includes(elem)) // remove children if greater depth
163158
}
164159

165-
var container = SelectorEngine.findOne(this._selector)
160+
const container = SelectorEngine.findOne(this._selector)
166161
if (actives.length) {
167-
var tempActiveData = actives.find(function(elem) {
168-
return container !== elem
169-
})
162+
const tempActiveData = actives.find(elem => container !== elem)
170163
activesData = tempActiveData ? Collapse.getInstance(tempActiveData) : null
171164

172165
if (activesData && activesData._isTransitioning) {
173166
return
174167
}
175168
}
176169

177-
var startEvent = EventHandler.trigger(this._element, EVENT_SHOW)
170+
const startEvent = EventHandler.trigger(this._element, EVENT_SHOW)
178171
if (startEvent.defaultPrevented) {
179172
return
180173
}
181174

182-
actives.forEach(function(elemActive) {
175+
actives.forEach(elemActive => {
183176
if (container !== elemActive) {
184177
Collapse.getOrCreateInstance(elemActive, {toggle: false}).hide()
185178
}
@@ -189,7 +182,7 @@ define([
189182
}
190183
})
191184

192-
var dimension = this._getDimension()
185+
const dimension = this._getDimension()
193186

194187
this._element.classList.remove(CLASS_NAME_COLLAPSE)
195188
this._element.classList.add(CLASS_NAME_COLLAPSING)
@@ -199,20 +192,19 @@ define([
199192
this._addAriaAndCollapsedClass(this._triggerArray, true)
200193
this._isTransitioning = true
201194

202-
var self = this;
203-
var complete = function() {
204-
self._isTransitioning = false
195+
const complete = () => {
196+
this._isTransitioning = false
205197

206-
self._element.classList.remove(CLASS_NAME_COLLAPSING)
207-
self._element.classList.add(CLASS_NAME_COLLAPSE, CLASS_NAME_SHOW)
198+
this._element.classList.remove(CLASS_NAME_COLLAPSING)
199+
this._element.classList.add(CLASS_NAME_COLLAPSE, CLASS_NAME_SHOW)
208200

209-
self._element.style[dimension] = ''
201+
this._element.style[dimension] = ''
210202

211-
EventHandler.trigger(self._element, EVENT_SHOWN)
203+
EventHandler.trigger(this._element, EVENT_SHOWN)
212204
}
213205

214-
var capitalizedDimension = dimension[0].toUpperCase() + dimension.slice(1)
215-
var scrollSize = `scroll${capitalizedDimension}`
206+
const capitalizedDimension = dimension[0].toUpperCase() + dimension.slice(1)
207+
const scrollSize = `scroll${capitalizedDimension}`
216208

217209
this._queueCallback(complete, this._element, true)
218210
this._element.style[dimension] = `${this._element[scrollSize]}px`
@@ -223,12 +215,12 @@ define([
223215
return
224216
}
225217

226-
var startEvent = EventHandler.trigger(this._element, EVENT_HIDE)
218+
const startEvent = EventHandler.trigger(this._element, EVENT_HIDE)
227219
if (startEvent.defaultPrevented) {
228220
return
229221
}
230222

231-
var dimension = this._getDimension()
223+
const dimension = this._getDimension()
232224

233225
this._element.style[dimension] = `${this._element.getBoundingClientRect()[dimension]}px`
234226

@@ -237,10 +229,10 @@ define([
237229
this._element.classList.add(CLASS_NAME_COLLAPSING)
238230
this._element.classList.remove(CLASS_NAME_COLLAPSE, CLASS_NAME_SHOW)
239231

240-
var triggerArrayLength = this._triggerArray.length
241-
for (var i = 0; i < triggerArrayLength; i++) {
242-
var trigger = this._triggerArray[i]
243-
var elem = getElementFromSelector(trigger)
232+
const triggerArrayLength = this._triggerArray.length
233+
for (let i = 0; i < triggerArrayLength; i++) {
234+
const trigger = this._triggerArray[i]
235+
const elem = getElementFromSelector(trigger)
244236

245237
if (elem && !this._isShown(elem)) {
246238
this._addAriaAndCollapsedClass([trigger], false)
@@ -249,12 +241,11 @@ define([
249241

250242
this._isTransitioning = true
251243

252-
var self = this;
253-
var complete = function() {
254-
self._isTransitioning = false
255-
self._element.classList.remove(CLASS_NAME_COLLAPSING)
256-
self._element.classList.add(CLASS_NAME_COLLAPSE)
257-
EventHandler.trigger(self._element, EVENT_HIDDEN)
244+
const complete = () => {
245+
this._isTransitioning = false
246+
this._element.classList.remove(CLASS_NAME_COLLAPSING)
247+
this._element.classList.add(CLASS_NAME_COLLAPSE)
248+
EventHandler.trigger(this._element, EVENT_HIDDEN)
258249
}
259250

260251
this._element.style[dimension] = ''
@@ -289,25 +280,23 @@ define([
289280
return
290281
}
291282

292-
var children = SelectorEngine.find(CLASS_NAME_DEEPER_CHILDREN, this._config.parent)
293-
SelectorEngine.find(SELECTOR_DATA_TOGGLE, this._config.parent).filter(function(elem) {
294-
return !children.includes(elem)
295-
})
296-
.forEach(function(element) {
297-
var selected = getElementFromSelector(element)
283+
const children = SelectorEngine.find(CLASS_NAME_DEEPER_CHILDREN, this._config.parent)
284+
SelectorEngine.find(SELECTOR_DATA_TOGGLE, this._config.parent).filter(elem => !children.includes(elem))
285+
.forEach(element => {
286+
const selected = getElementFromSelector(element)
298287

299-
if (selected) {
300-
this._addAriaAndCollapsedClass([element], this._isShown(selected))
301-
}
302-
})
288+
if (selected) {
289+
this._addAriaAndCollapsedClass([element], this._isShown(selected))
290+
}
291+
})
303292
}
304293

305294
Collapse.prototype._addAriaAndCollapsedClass = function(triggerArray, isOpen) {
306295
if (!triggerArray.length) {
307296
return
308297
}
309298

310-
triggerArray.forEach(function(elem) {
299+
triggerArray.forEach(elem => {
311300
if (isOpen) {
312301
elem.classList.remove(CLASS_NAME_COLLAPSED)
313302
} else {
@@ -330,12 +319,12 @@ define([
330319

331320
Collapse.jQueryInterface = function(config) {
332321
return this.each(function () {
333-
var _config = {}
322+
const _config = {}
334323
if (typeof config === 'string' && /show|hide/.test(config)) {
335324
_config.toggle = false
336325
}
337326

338-
var data = Collapse.getOrCreateInstance(this, _config)
327+
const data = Collapse.getOrCreateInstance(this, _config)
339328

340329
if (typeof config === 'string') {
341330
if (typeof data[config] === 'undefined') {
@@ -359,10 +348,10 @@ define([
359348
event.preventDefault()
360349
}
361350

362-
var selector = getSelectorFromElement(this)
363-
var selectorElements = SelectorEngine.find(selector)
351+
const selector = getSelectorFromElement(this)
352+
const selectorElements = SelectorEngine.find(selector)
364353

365-
selectorElements.forEach(function(element) {
354+
selectorElements.forEach(element => {
366355
Collapse.getOrCreateInstance(element, {toggle: false}).toggle()
367356
})
368357
})

‎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-
var 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-
var 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-
var instanceMap = elementMap.get(element)
51+
const instanceMap = elementMap.get(element)
5252

5353
instanceMap.delete(key)
5454

0 commit comments

Comments
 (0)