Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f5efb74

Browse files
rosskevinrosskevin
committedApr 28, 2016
blanket code format
1 parent efc1592 commit f5efb74

23 files changed

+297
-40
lines changed
 

‎js/base.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ const Base = class {
1010
this.config = extend(true, {}, Default, ...configs)
1111
}
1212

13-
i18n(key){
13+
i18n(key) {
1414
return this.config.i18n[this.config.lang][key] || ''
1515
}
1616

1717
dispose(dataKey = null) {
18-
if(dataKey) {
18+
if (dataKey) {
1919
this.$element.data(dataKey, null)
2020
}
2121
this.$element = null
@@ -49,6 +49,7 @@ const Base = class {
4949
error(...args) {
5050
console.error(...args)
5151
}
52+
5253
/* eslint-enable no-console */
5354

5455
throwError(msg) {

‎js/datepicker.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,13 +467,13 @@ const Datepicker = (($) => {
467467
}
468468
else {
469469
let nextView = this.boundedView(this.view + direction)
470-
if(this.config.view.disabled.includes(nextView)){
470+
if (this.config.view.disabled.includes(nextView)) {
471471

472472
// determine general direction
473473
let skipDisabledDirection = (direction < 1) ? -1 : 1
474474
this.changeView(direction + skipDisabledDirection)
475475
}
476-
else{
476+
else {
477477
this.showView(nextView)
478478
}
479479
}
@@ -484,7 +484,7 @@ const Datepicker = (($) => {
484484
* @param view
485485
* @returns {number}
486486
*/
487-
boundedView(view){
487+
boundedView(view) {
488488
return Math.max(this.config.view.min, Math.min(this.config.view.max, view))
489489
}
490490

@@ -576,7 +576,7 @@ const Datepicker = (($) => {
576576
this.config.view.min = this.resolveViewType(this.config.view.min)
577577
this.config.view.max = this.resolveViewType(this.config.view.max) // default to years (slightly different than other view resolution)
578578
let disabledViews = this.config.view.disabled
579-
if(!Array.isArray(disabledViews)){
579+
if (!Array.isArray(disabledViews)) {
580580
disabledViews = [disabledViews]
581581
}
582582
this.config.view.disabled = []

‎js/templates/baseTemplate.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,19 @@ const BaseTemplate = class extends Base {
5252
return 'dd' // Su Mo Tu We Th Fr Sa
5353
}
5454

55-
getLabelYearFormat(){
55+
getLabelYearFormat() {
5656
return 'YYYY'
5757
}
5858

5959
getLabelDateFormat() {
6060
return `ddd, MMM D` // Thu, Apr 13
6161
}
6262

63-
formatDaySwitch(date){
63+
formatDaySwitch(date) {
6464
return date.format(this.getDaySwitchFormat())
6565
}
6666

67-
formatDayOfWeek(date){
67+
formatDayOfWeek(date) {
6868
return date.format(this.getDayOfWeekFormat())
6969
}
7070

‎js/templates/bmd4Template.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const BMD4Template = class extends BaseTemplate {
3838
* @param date
3939
* @returns string
4040
*/
41-
formatDayOfWeek(date){
41+
formatDayOfWeek(date) {
4242
return super.formatDayOfWeek(date)[0] // S M T W T F S
4343
}
4444

@@ -62,12 +62,12 @@ const BMD4Template = class extends BaseTemplate {
6262
<table>
6363
<thead></thead>
6464
<tbody>`
65-
if (className !== ClassName.DAYS) {
66-
html += `<tr>
65+
if (className !== ClassName.DAYS) {
66+
html += `<tr>
6767
<td colspan="7"></td>
6868
</tr>`
69-
}
70-
html += `</tbody>
69+
}
70+
html += `</tbody>
7171
</table>
7272
</div>
7373

‎js/templates/stringTemplate.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ const BS4Template = class extends BaseTemplate {
1616
super(Default)
1717
this.stringTemplate = stringTemplate
1818
}
19-
20-
getTemplate(){
19+
20+
getTemplate() {
2121
return this.stringTemplate
2222
}
2323
}

‎js/util/dateArray.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ const DateArray = class {
5252
return false
5353
}
5454

55-
if(this.length() !== otherDateArray.length()){
55+
if (this.length() !== otherDateArray.length()) {
5656
return false
5757
}
5858

5959
for (let i in this.array) {
6060
let a = this.array[i]
6161
let b = otherDateArray.array[i]
6262

63-
if(!a.isSame(b)){
63+
if (!a.isSame(b)) {
6464
return false
6565
}
6666
}

‎test/datepicker/config/autoclose.js

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1-
import {$, $input, safeDispose, fromData, assertData, assertText, findPopper, findToday, assertNotFound, assertVisible, assertHidden, assertDatesEqual, findDayOfMonth, prepare, YYYY_MM_DD, MM_DD_YYYY} from '../../support'
1+
import {
2+
$,
3+
$input,
4+
safeDispose,
5+
fromData,
6+
assertData,
7+
assertText,
8+
findPopper,
9+
findToday,
10+
assertNotFound,
11+
assertVisible,
12+
assertHidden,
13+
assertDatesEqual,
14+
findDayOfMonth,
15+
prepare,
16+
YYYY_MM_DD,
17+
MM_DD_YYYY
18+
} from '../../support'
219
import {Selector, ClassName} from '../../../js/constants'
320
import moment from 'moment'
421

‎test/datepicker/config/callbacks.js

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,25 @@
1-
import {$, $input, safeDispose, fromData, assertData, assertText, findPopper, findToday, findMonth, findYear, findDecade, findCentury, assertNotFound, assertVisible, assertHidden, assertDatesEqual, findDayOfMonth, prepare, YYYY_MM_DD, MM_DD_YYYY} from '../../support'
1+
import {
2+
$,
3+
$input,
4+
safeDispose,
5+
fromData,
6+
assertData,
7+
assertText,
8+
findPopper,
9+
findToday,
10+
findMonth,
11+
findYear,
12+
findDecade,
13+
findCentury,
14+
assertNotFound,
15+
assertVisible,
16+
assertHidden,
17+
assertDatesEqual,
18+
findDayOfMonth,
19+
prepare,
20+
YYYY_MM_DD,
21+
MM_DD_YYYY
22+
} from '../../support'
223
import {Selector, ClassName} from '../../../js/constants'
324
import moment from 'moment'
425

‎test/datepicker/config/clear.js

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,24 @@
1-
import {$, $input, safeDispose, fromData, assertData, assertText, findPopper, findToday, assertNotFound, assertVisible, assertHidden, assertDatesEqual, findDayOfMonth, prepare, YYYY_MM_DD, findMonthsSwitch, findYearsSwitch, findDecadesSwitch, findCenturiesSwitch} from '../../support'
1+
import {
2+
$,
3+
$input,
4+
safeDispose,
5+
fromData,
6+
assertData,
7+
assertText,
8+
findPopper,
9+
findToday,
10+
assertNotFound,
11+
assertVisible,
12+
assertHidden,
13+
assertDatesEqual,
14+
findDayOfMonth,
15+
prepare,
16+
YYYY_MM_DD,
17+
findMonthsSwitch,
18+
findYearsSwitch,
19+
findDecadesSwitch,
20+
findCenturiesSwitch
21+
} from '../../support'
222
import {Selector, ClassName} from '../../../js/constants'
323
import moment from 'moment'
424

‎test/datepicker/config/date.js

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
1-
import {$, $input, safeDispose, fromData, assertData, assertText, findPopper, findToday, findActiveDay, assertNotFound, assertVisible, assertHidden, assertDatesEqual, findDayOfMonth, prepare, YYYY_MM_DD, MM_DD_YYYY} from '../../support'
1+
import {
2+
$,
3+
$input,
4+
safeDispose,
5+
fromData,
6+
assertData,
7+
assertText,
8+
findPopper,
9+
findToday,
10+
findActiveDay,
11+
assertNotFound,
12+
assertVisible,
13+
assertHidden,
14+
assertDatesEqual,
15+
findDayOfMonth,
16+
prepare,
17+
YYYY_MM_DD,
18+
MM_DD_YYYY
19+
} from '../../support'
220
import {Selector, ClassName, Data} from '../../../js/constants'
321
import moment from 'moment'
422

‎test/datepicker/config/daysOfWeek.js

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
1-
import {$, $input, safeDispose, fromData, assertData, assertText, findPopper, findToday, findActiveDay, assertNotFound, assertVisible, assertHidden, assertDatesEqual, findDayOfMonth, prepare, YYYY_MM_DD, MM_DD_YYYY} from '../../support'
1+
import {
2+
$,
3+
$input,
4+
safeDispose,
5+
fromData,
6+
assertData,
7+
assertText,
8+
findPopper,
9+
findToday,
10+
findActiveDay,
11+
assertNotFound,
12+
assertVisible,
13+
assertHidden,
14+
assertDatesEqual,
15+
findDayOfMonth,
16+
prepare,
17+
YYYY_MM_DD,
18+
MM_DD_YYYY
19+
} from '../../support'
220
import {Selector, ClassName, Data} from '../../../js/constants'
321
import moment from 'moment'
422

‎test/datepicker/config/enableOnReadonly.js

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1-
import {$, $input, safeDispose, fromData, assertData, assertText, findPopper, findToday, assertNotFound, assertVisible, assertHidden, assertDatesEqual, findDayOfMonth, prepare, YYYY_MM_DD, MM_DD_YYYY} from '../../support'
1+
import {
2+
$,
3+
$input,
4+
safeDispose,
5+
fromData,
6+
assertData,
7+
assertText,
8+
findPopper,
9+
findToday,
10+
assertNotFound,
11+
assertVisible,
12+
assertHidden,
13+
assertDatesEqual,
14+
findDayOfMonth,
15+
prepare,
16+
YYYY_MM_DD,
17+
MM_DD_YYYY
18+
} from '../../support'
219
import {Selector, ClassName} from '../../../js/constants'
320
import moment from 'moment'
421

‎test/datepicker/config/format.js

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
1-
import {$, $input, safeDispose, fromData, assertData, assertText, findPopper, findToday, assertNotFound, assertVisible, assertHidden, assertDatesEqual, findDayOfMonth, prepare, YYYY_MM_DD} from '../../support'
1+
import {
2+
$,
3+
$input,
4+
safeDispose,
5+
fromData,
6+
assertData,
7+
assertText,
8+
findPopper,
9+
findToday,
10+
assertNotFound,
11+
assertVisible,
12+
assertHidden,
13+
assertDatesEqual,
14+
findDayOfMonth,
15+
prepare,
16+
YYYY_MM_DD
17+
} from '../../support'
218
import {Selector, ClassName} from '../../../js/constants'
319
import moment from 'moment'
420

‎test/datepicker/config/showOnFocus.js

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1-
import {$, $input, safeDispose, fromData, assertData, assertText, findPopper, findToday, assertNotFound, assertVisible, assertHidden, assertDatesEqual, findDayOfMonth, prepare, YYYY_MM_DD, MM_DD_YYYY} from '../../support'
1+
import {
2+
$,
3+
$input,
4+
safeDispose,
5+
fromData,
6+
assertData,
7+
assertText,
8+
findPopper,
9+
findToday,
10+
assertNotFound,
11+
assertVisible,
12+
assertHidden,
13+
assertDatesEqual,
14+
findDayOfMonth,
15+
prepare,
16+
YYYY_MM_DD,
17+
MM_DD_YYYY
18+
} from '../../support'
219
import {Selector, ClassName} from '../../../js/constants'
320
import moment from 'moment'
421

‎test/datepicker/config/today.js

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,24 @@
1-
import {$, $input, safeDispose, fromData, assertData, assertText, findPopper, findToday, assertNotFound, assertVisible, assertHidden, assertDatesEqual, findDayOfMonth, prepare, YYYY_MM_DD, findMonthsSwitch, findYearsSwitch, findDecadesSwitch, findCenturiesSwitch} from '../../support'
1+
import {
2+
$,
3+
$input,
4+
safeDispose,
5+
fromData,
6+
assertData,
7+
assertText,
8+
findPopper,
9+
findToday,
10+
assertNotFound,
11+
assertVisible,
12+
assertHidden,
13+
assertDatesEqual,
14+
findDayOfMonth,
15+
prepare,
16+
YYYY_MM_DD,
17+
findMonthsSwitch,
18+
findYearsSwitch,
19+
findDecadesSwitch,
20+
findCenturiesSwitch
21+
} from '../../support'
222
import {Selector, ClassName} from '../../../js/constants'
323
import moment from 'moment'
424

‎test/datepicker/config/view.js

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
1-
import {$, $input, safeDispose, fromData, assertData, assertText, findPopper, findToday, assertNotFound, assertVisible, assertHidden, assertDatesEqual, findDayOfMonth, prepare, YYYY_MM_DD} from '../../support'
1+
import {
2+
$,
3+
$input,
4+
safeDispose,
5+
fromData,
6+
assertData,
7+
assertText,
8+
findPopper,
9+
findToday,
10+
assertNotFound,
11+
assertVisible,
12+
assertHidden,
13+
assertDatesEqual,
14+
findDayOfMonth,
15+
prepare,
16+
YYYY_MM_DD
17+
} from '../../support'
218
import {Selector, ClassName} from '../../../js/constants'
319
import moment from 'moment'
420

‎test/datepicker/keyboard.js

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,29 @@
1-
import {$, $input, safeDispose, fromData, assertData, findPopper, findFocusedDay, findDayOfMonth, findPrev, findMonth, findNext, findYear, findDecade, findCentury, assertNotFound, assertVisible, assertHidden, assertDatesEqual, prepare, findMonthsSwitch, findYearsSwitch, findDecadesSwitch, findCenturiesSwitch, fireKey} from '../support'
1+
import {
2+
$,
3+
$input,
4+
safeDispose,
5+
fromData,
6+
assertData,
7+
findPopper,
8+
findFocusedDay,
9+
findDayOfMonth,
10+
findPrev,
11+
findMonth,
12+
findNext,
13+
findYear,
14+
findDecade,
15+
findCentury,
16+
assertNotFound,
17+
assertVisible,
18+
assertHidden,
19+
assertDatesEqual,
20+
prepare,
21+
findMonthsSwitch,
22+
findYearsSwitch,
23+
findDecadesSwitch,
24+
findCenturiesSwitch,
25+
fireKey
26+
} from '../support'
227
import {Selector, ClassName, Data} from '../../js/constants'
328
import Keycodes from '../../js/util/keycodes'
429
import moment from 'moment'
@@ -209,7 +234,7 @@ describe('Datepicker', () => {
209234
})
210235

211236
describe('autoclose', () => {
212-
beforeEach(() => prepare() )
237+
beforeEach(() => prepare())
213238

214239
it(`enter should select today and hide`, () => {
215240
$input.datepicker({autoclose: true})

‎test/datepicker/mouse.js

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
1-
import {$, $input, safeDispose, fromData, assertData, findPopper, findFocusedDay, findDayOfMonth, findPrev, findMonth, findNext, findYear, findDecade, findCentury, assertNotFound, assertVisible, assertHidden, assertDatesEqual, prepare, findMonthsSwitch, findYearsSwitch, findDecadesSwitch, findCenturiesSwitch} from '../support'
1+
import {
2+
$,
3+
$input,
4+
safeDispose,
5+
fromData,
6+
assertData,
7+
findPopper,
8+
findFocusedDay,
9+
findDayOfMonth,
10+
findPrev,
11+
findMonth,
12+
findNext,
13+
findYear,
14+
findDecade,
15+
findCentury,
16+
assertNotFound,
17+
assertVisible,
18+
assertHidden,
19+
assertDatesEqual,
20+
prepare,
21+
findMonthsSwitch,
22+
findYearsSwitch,
23+
findDecadesSwitch,
24+
findCenturiesSwitch
25+
} from '../support'
226
import {Selector, ClassName, Data} from '../../js/constants'
327
import moment from 'moment'
428

‎test/datepicker/showHide.js

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
import {$, $input, safeDispose, fromData, assertData, findPopper, assertNotFound, assertVisible, assertHidden, assertDatesEqual, prepare} from '../support'
1+
import {
2+
$,
3+
$input,
4+
safeDispose,
5+
fromData,
6+
assertData,
7+
findPopper,
8+
assertNotFound,
9+
assertVisible,
10+
assertHidden,
11+
assertDatesEqual,
12+
prepare
13+
} from '../support'
214
import {Selector, ClassName} from '../../js/constants'
315
import moment from 'moment'
416

‎test/datepicker/update.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
1-
import {$, $input, safeDispose, fromData, assertData, findPopper, assertNotFound, assertVisible, assertHidden, assertDatesEqual, findDayOfMonth, prepare} from '../support'
1+
import {
2+
$,
3+
$input,
4+
safeDispose,
5+
fromData,
6+
assertData,
7+
findPopper,
8+
assertNotFound,
9+
assertVisible,
10+
assertHidden,
11+
assertDatesEqual,
12+
findDayOfMonth,
13+
prepare
14+
} from '../support'
215
import {Selector, ClassName} from '../../js/constants'
316
import moment from 'moment'
417

‎test/setup/ES2015.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ describe('Test setup (ES2015)', function () {
55

66
it('should be able to jquery find element', () => {
77
var $input = $('input')
8-
if($input.length !== 1){
8+
if ($input.length !== 1) {
99
console.error('Expected length to be 1 but found', $input)
1010
throw new Error('Expected length to be 1')
1111
}

‎test/setup/ES5.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ describe('Test setup (pre-ES2015)', function () {
33

44
it('should be able to jquery find element', function () {
55
var $input = $('input')
6-
if($input.length !== 1){
6+
if ($input.length !== 1) {
77
console.error('Expected length to be 1 but found', $input)
88
throw new Error('Expected length to be 1')
99
}

‎test/support.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@ export const prepare = () => {
1414

1515
export const safeDispose = () => {
1616
// regardless of the state of the test, try to clean up every artifact so each test is isolated
17-
try {$input.datepicker('dispose')}
18-
catch (error) {}
17+
try {
18+
$input.datepicker('dispose')
19+
}
20+
catch (error) {
21+
}
1922

2023
findPopper().remove()
2124
$input.data(Data.KEY, null)
@@ -66,11 +69,10 @@ export const assertText = (selector, text) => {
6669
}
6770

6871

69-
7072
export const assertDatesEqual = (actual, expected, granularity = 'millisecond') => {
7173
let msg = `${actual ? actual.format() : null} should equal ${expected ? expected.format() : null}`
7274

73-
if(expected == null){
75+
if (expected == null) {
7476
expect(actual, msg).to.be.null
7577
}
7678
else {
@@ -79,7 +81,7 @@ export const assertDatesEqual = (actual, expected, granularity = 'millisecond')
7981
}
8082

8183
// add exact match textEquals filter to jquery (contains will get multiple days)
82-
$.expr[':'].textEquals = function(el, i, m) {
84+
$.expr[':'].textEquals = function (el, i, m) {
8385
var searchText = m[3]
8486
var match = $(el).text().trim().match(`^${searchText}$`)
8587
return match && match.length > 0

0 commit comments

Comments
 (0)
Please sign in to comment.