Skip to content

Commit b4ce52d

Browse files
XhmikosRXhmikosR
committed
JS: minor refactoring
* shorten block comments * reorder constants
1 parent 188b801 commit b4ce52d

12 files changed

+174
-309
lines changed

‎js/src/alert.js

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ import $ from 'jquery'
99
import Util from './util'
1010

1111
/**
12-
* ------------------------------------------------------------------------
1312
* Constants
14-
* ------------------------------------------------------------------------
1513
*/
1614

1715
const NAME = 'alert'
@@ -21,20 +19,18 @@ const EVENT_KEY = `.${DATA_KEY}`
2119
const DATA_API_KEY = '.data-api'
2220
const JQUERY_NO_CONFLICT = $.fn[NAME]
2321

24-
const SELECTOR_DISMISS = '[data-dismiss="alert"]'
22+
const CLASS_NAME_ALERT = 'alert'
23+
const CLASS_NAME_FADE = 'fade'
24+
const CLASS_NAME_SHOW = 'show'
2525

2626
const EVENT_CLOSE = `close${EVENT_KEY}`
2727
const EVENT_CLOSED = `closed${EVENT_KEY}`
2828
const EVENT_CLICK_DATA_API = `click${EVENT_KEY}${DATA_API_KEY}`
2929

30-
const CLASS_NAME_ALERT = 'alert'
31-
const CLASS_NAME_FADE = 'fade'
32-
const CLASS_NAME_SHOW = 'show'
30+
const SELECTOR_DISMISS = '[data-dismiss="alert"]'
3331

3432
/**
35-
* ------------------------------------------------------------------------
36-
* Class Definition
37-
* ------------------------------------------------------------------------
33+
* Class definition
3834
*/
3935

4036
class Alert {
@@ -43,13 +39,11 @@ class Alert {
4339
}
4440

4541
// Getters
46-
4742
static get VERSION() {
4843
return VERSION
4944
}
5045

5146
// Public
52-
5347
close(element) {
5448
let rootElement = this._element
5549
if (element) {
@@ -71,7 +65,6 @@ class Alert {
7165
}
7266

7367
// Private
74-
7568
_getRootElement(element) {
7669
const selector = Util.getSelectorFromElement(element)
7770
let parent = false
@@ -117,7 +110,6 @@ class Alert {
117110
}
118111

119112
// Static
120-
121113
static _jQueryInterface(config) {
122114
return this.each(function () {
123115
const $element = $(this)
@@ -146,9 +138,7 @@ class Alert {
146138
}
147139

148140
/**
149-
* ------------------------------------------------------------------------
150-
* Data Api implementation
151-
* ------------------------------------------------------------------------
141+
* Data API implementation
152142
*/
153143

154144
$(document).on(
@@ -158,9 +148,7 @@ $(document).on(
158148
)
159149

160150
/**
161-
* ------------------------------------------------------------------------
162151
* jQuery
163-
* ------------------------------------------------------------------------
164152
*/
165153

166154
$.fn[NAME] = Alert._jQueryInterface

‎js/src/button.js

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
import $ from 'jquery'
99

1010
/**
11-
* ------------------------------------------------------------------------
1211
* Constants
13-
* ------------------------------------------------------------------------
1412
*/
1513

1614
const NAME = 'button'
@@ -24,6 +22,11 @@ const CLASS_NAME_ACTIVE = 'active'
2422
const CLASS_NAME_BUTTON = 'btn'
2523
const CLASS_NAME_FOCUS = 'focus'
2624

25+
const EVENT_CLICK_DATA_API = `click${EVENT_KEY}${DATA_API_KEY}`
26+
const EVENT_FOCUS_BLUR_DATA_API = `focus${EVENT_KEY}${DATA_API_KEY} ` +
27+
`blur${EVENT_KEY}${DATA_API_KEY}`
28+
const EVENT_LOAD_DATA_API = `load${EVENT_KEY}${DATA_API_KEY}`
29+
2730
const SELECTOR_DATA_TOGGLE_CARROT = '[data-toggle^="button"]'
2831
const SELECTOR_DATA_TOGGLES = '[data-toggle="buttons"]'
2932
const SELECTOR_DATA_TOGGLE = '[data-toggle="button"]'
@@ -32,15 +35,8 @@ const SELECTOR_INPUT = 'input:not([type="hidden"])'
3235
const SELECTOR_ACTIVE = '.active'
3336
const SELECTOR_BUTTON = '.btn'
3437

35-
const EVENT_CLICK_DATA_API = `click${EVENT_KEY}${DATA_API_KEY}`
36-
const EVENT_FOCUS_BLUR_DATA_API = `focus${EVENT_KEY}${DATA_API_KEY} ` +
37-
`blur${EVENT_KEY}${DATA_API_KEY}`
38-
const EVENT_LOAD_DATA_API = `load${EVENT_KEY}${DATA_API_KEY}`
39-
4038
/**
41-
* ------------------------------------------------------------------------
42-
* Class Definition
43-
* ------------------------------------------------------------------------
39+
* Class definition
4440
*/
4541

4642
class Button {
@@ -50,13 +46,11 @@ class Button {
5046
}
5147

5248
// Getters
53-
5449
static get VERSION() {
5550
return VERSION
5651
}
5752

5853
// Public
59-
6054
toggle() {
6155
let triggerChangeEvent = true
6256
let addAriaPressed = true
@@ -111,7 +105,6 @@ class Button {
111105
}
112106

113107
// Static
114-
115108
static _jQueryInterface(config, avoidTriggerChange) {
116109
return this.each(function () {
117110
const $element = $(this)
@@ -132,9 +125,7 @@ class Button {
132125
}
133126

134127
/**
135-
* ------------------------------------------------------------------------
136-
* Data Api implementation
137-
* ------------------------------------------------------------------------
128+
* Data API implementation
138129
*/
139130

140131
$(document)
@@ -194,9 +185,7 @@ $(window).on(EVENT_LOAD_DATA_API, () => {
194185
})
195186

196187
/**
197-
* ------------------------------------------------------------------------
198188
* jQuery
199-
* ------------------------------------------------------------------------
200189
*/
201190

202191
$.fn[NAME] = Button._jQueryInterface

‎js/src/carousel.js

Lines changed: 29 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ import $ from 'jquery'
99
import Util from './util'
1010

1111
/**
12-
* ------------------------------------------------------------------------
1312
* Constants
14-
* ------------------------------------------------------------------------
1513
*/
1614

1715
const NAME = 'carousel'
@@ -25,23 +23,14 @@ const ARROW_RIGHT_KEYCODE = 39 // KeyboardEvent.which value for right arrow key
2523
const TOUCHEVENT_COMPAT_WAIT = 500 // Time for mouse compat events to fire after touch
2624
const SWIPE_THRESHOLD = 40
2725

28-
const Default = {
29-
interval: 5000,
30-
keyboard: true,
31-
slide: false,
32-
pause: 'hover',
33-
wrap: true,
34-
touch: true
35-
}
36-
37-
const DefaultType = {
38-
interval: '(number|boolean)',
39-
keyboard: 'boolean',
40-
slide: '(boolean|string)',
41-
pause: '(string|boolean)',
42-
wrap: 'boolean',
43-
touch: 'boolean'
44-
}
26+
const CLASS_NAME_CAROUSEL = 'carousel'
27+
const CLASS_NAME_ACTIVE = 'active'
28+
const CLASS_NAME_SLIDE = 'slide'
29+
const CLASS_NAME_RIGHT = 'carousel-item-right'
30+
const CLASS_NAME_LEFT = 'carousel-item-left'
31+
const CLASS_NAME_NEXT = 'carousel-item-next'
32+
const CLASS_NAME_PREV = 'carousel-item-prev'
33+
const CLASS_NAME_POINTER_EVENT = 'pointer-event'
4534

4635
const DIRECTION_NEXT = 'next'
4736
const DIRECTION_PREV = 'prev'
@@ -62,15 +51,6 @@ const EVENT_DRAG_START = `dragstart${EVENT_KEY}`
6251
const EVENT_LOAD_DATA_API = `load${EVENT_KEY}${DATA_API_KEY}`
6352
const EVENT_CLICK_DATA_API = `click${EVENT_KEY}${DATA_API_KEY}`
6453

65-
const CLASS_NAME_CAROUSEL = 'carousel'
66-
const CLASS_NAME_ACTIVE = 'active'
67-
const CLASS_NAME_SLIDE = 'slide'
68-
const CLASS_NAME_RIGHT = 'carousel-item-right'
69-
const CLASS_NAME_LEFT = 'carousel-item-left'
70-
const CLASS_NAME_NEXT = 'carousel-item-next'
71-
const CLASS_NAME_PREV = 'carousel-item-prev'
72-
const CLASS_NAME_POINTER_EVENT = 'pointer-event'
73-
7454
const SELECTOR_ACTIVE = '.active'
7555
const SELECTOR_ACTIVE_ITEM = '.active.carousel-item'
7656
const SELECTOR_ITEM = '.carousel-item'
@@ -80,16 +60,33 @@ const SELECTOR_INDICATORS = '.carousel-indicators'
8060
const SELECTOR_DATA_SLIDE = '[data-slide], [data-slide-to]'
8161
const SELECTOR_DATA_RIDE = '[data-ride="carousel"]'
8262

63+
const Default = {
64+
interval: 5000,
65+
keyboard: true,
66+
slide: false,
67+
pause: 'hover',
68+
wrap: true,
69+
touch: true
70+
}
71+
72+
const DefaultType = {
73+
interval: '(number|boolean)',
74+
keyboard: 'boolean',
75+
slide: '(boolean|string)',
76+
pause: '(string|boolean)',
77+
wrap: 'boolean',
78+
touch: 'boolean'
79+
}
80+
8381
const PointerType = {
8482
TOUCH: 'touch',
8583
PEN: 'pen'
8684
}
8785

8886
/**
89-
* ------------------------------------------------------------------------
90-
* Class Definition
91-
* ------------------------------------------------------------------------
87+
* Class definition
9288
*/
89+
9390
class Carousel {
9491
constructor(element, config) {
9592
this._items = null
@@ -111,7 +108,6 @@ class Carousel {
111108
}
112109

113110
// Getters
114-
115111
static get VERSION() {
116112
return VERSION
117113
}
@@ -121,7 +117,6 @@ class Carousel {
121117
}
122118

123119
// Public
124-
125120
next() {
126121
if (!this._isSliding) {
127122
this._slide(DIRECTION_NEXT)
@@ -220,7 +215,6 @@ class Carousel {
220215
}
221216

222217
// Private
223-
224218
_getConfig(config) {
225219
config = {
226220
...Default,
@@ -508,7 +502,6 @@ class Carousel {
508502
}
509503

510504
// Static
511-
512505
static _jQueryInterface(config) {
513506
return this.each(function () {
514507
let data = $(this).data(DATA_KEY)
@@ -580,9 +573,7 @@ class Carousel {
580573
}
581574

582575
/**
583-
* ------------------------------------------------------------------------
584-
* Data Api implementation
585-
* ------------------------------------------------------------------------
576+
* Data API implementation
586577
*/
587578

588579
$(document).on(EVENT_CLICK_DATA_API, SELECTOR_DATA_SLIDE, Carousel._dataApiClickHandler)
@@ -596,9 +587,7 @@ $(window).on(EVENT_LOAD_DATA_API, () => {
596587
})
597588

598589
/**
599-
* ------------------------------------------------------------------------
600590
* jQuery
601-
* ------------------------------------------------------------------------
602591
*/
603592

604593
$.fn[NAME] = Carousel._jQueryInterface

0 commit comments

Comments
 (0)