Skip to content

Commit 9c3f34f

Browse files
gregueirasgregueiras
committed
Fix Lint Errors
1 parent d4123ee commit 9c3f34f

File tree

3 files changed

+68
-31
lines changed

3 files changed

+68
-31
lines changed

‎browser/main/lib/ThemeManager.js

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const chooseTheme = (ui) => {
1+
const chooseTheme = ui => {
22
if (!ui.enableScheduleTheme) {
33
return
44
}
@@ -11,9 +11,12 @@ const chooseTheme = (ui) => {
1111

1212
const isEndAfterStart = end > start
1313
const isBetweenStartAndEnd = minutes >= start && minutes <= end
14-
const isBetweenEndAndStart = (minutes >= start || minutes <= end)
14+
const isBetweenEndAndStart = minutes >= start || minutes <= end
1515

16-
if ((isEndAfterStart && isBetweenStartAndEnd) || (!isEndAfterStart && isBetweenEndAndStart)) {
16+
if (
17+
(isEndAfterStart && isBetweenStartAndEnd) ||
18+
(!isEndAfterStart && isBetweenEndAndStart)
19+
) {
1720
if (ui.theme !== ui.scheduledTheme) {
1821
ui.defaultTheme = ui.theme
1922
ui.theme = ui.scheduledTheme
@@ -27,8 +30,14 @@ const chooseTheme = (ui) => {
2730
}
2831
}
2932

30-
const applyTheme = (theme) => {
31-
const supportedThemes = ['dark', 'white', 'solarized-dark', 'monokai', 'dracula']
33+
const applyTheme = theme => {
34+
const supportedThemes = [
35+
'dark',
36+
'white',
37+
'solarized-dark',
38+
'monokai',
39+
'dracula'
40+
]
3241
if (supportedThemes.indexOf(theme) !== -1) {
3342
document.body.setAttribute('data-theme', theme)
3443
} else {

‎browser/main/modals/PreferencesModal/UiTab.js

Lines changed: 49 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ class UiTab extends React.Component {
219219
* Gets the total number of minutes and returns a string in the HH:MM format
220220
* @param {Number} time total number of minutes
221221
*/
222-
formatTime (time) {
222+
formatTime(time) {
223223
let hour = Math.floor(time / 60)
224224
let minute = time % 60
225225

@@ -234,24 +234,25 @@ class UiTab extends React.Component {
234234
return `${hour}:${minute}`
235235
}
236236

237-
handleSlider (e, number) {
237+
handleSlider(e, number) {
238238
const sliderID = 'rs-range-line-' + number
239239
const bulletID = 'rs-bullet-' + number
240240

241241
const rangeSlider = document.getElementById(sliderID)
242242
const rangeBullet = document.getElementById(bulletID)
243243

244244
if (rangeSlider && rangeBullet) {
245-
const bulletPosition = (rangeSlider.value / rangeSlider.max)
246-
rangeBullet.style.left = (bulletPosition * 574) + 6 * (1 - bulletPosition) + 'px'
245+
const bulletPosition = rangeSlider.value / rangeSlider.max
246+
rangeBullet.style.left =
247+
bulletPosition * 574 + 6 * (1 - bulletPosition) + 'px'
247248
}
248249

249250
if (e) {
250251
this.handleUIChange(e)
251252
}
252253
}
253254

254-
render () {
255+
render() {
255256
const UiAlert = this.state.UiAlert
256257
const UiAlertElement =
257258
UiAlert != null ? (
@@ -274,8 +275,9 @@ class UiTab extends React.Component {
274275
{i18n.__('Interface Theme')}
275276
</div>
276277
<div styleName='group-section-control'>
277-
<select value={config.ui.defaultTheme}
278-
onChange={(e) => this.handleUIChange(e)}
278+
<select
279+
value={config.ui.defaultTheme}
280+
onChange={e => this.handleUIChange(e)}
279281
ref='uiTheme'
280282
>
281283
<optgroup label='Light Themes'>
@@ -305,16 +307,16 @@ class UiTab extends React.Component {
305307
</select>
306308
</div>
307309
</div>
308-
<div styleName='group-header2'>
309-
{i18n.__('Theme Schedule')}
310-
</div>
310+
<div styleName='group-header2'>{i18n.__('Theme Schedule')}</div>
311311
<div styleName='group-checkBoxSection'>
312312
<label>
313-
<input onChange={(e) => this.handleUIChange(e)}
313+
<input
314+
onChange={e => this.handleUIChange(e)}
314315
checked={this.state.config.ui.enableScheduleTheme}
315316
ref='enableScheduleTheme'
316317
type='checkbox'
317-
/>&nbsp;
318+
/>
319+
&nbsp;
318320
{i18n.__('Enable Scheduled Themes')}
319321
</label>
320322
</div>
@@ -323,8 +325,9 @@ class UiTab extends React.Component {
323325
{i18n.__('Scheduled Theme')}
324326
</div>
325327
<div styleName='group-section-control'>
326-
<select value={config.ui.scheduledTheme}
327-
onChange={(e) => this.handleUIChange(e)}
328+
<select
329+
value={config.ui.scheduledTheme}
330+
onChange={e => this.handleUIChange(e)}
328331
ref='uiScheduledTheme'
329332
>
330333
<optgroup label='Light Themes'>
@@ -357,17 +360,42 @@ class UiTab extends React.Component {
357360
<div styleName='group-section'>
358361
<div styleName='container'>
359362
<div styleName='range-slider' id='firstRow'>
360-
<span id='rs-bullet-1' styleName='rs-label'>{`End: ${this.formatTime(config.ui.scheduleEnd)}`}</span>
361-
<input id='rs-range-line-1' styleName='rs-range' type='range' value={config.ui.scheduleEnd} min='0' max='1440' step='5' ref='scheduleEnd'
362-
onChange={(e) => this.handleSlider(e, 1)} />
363+
<span
364+
id='rs-bullet-1'
365+
styleName='rs-label'
366+
>{`End: ${this.formatTime(config.ui.scheduleEnd)}`}</span>
367+
<input
368+
id='rs-range-line-1'
369+
styleName='rs-range'
370+
type='range'
371+
value={config.ui.scheduleEnd}
372+
min='0'
373+
max='1440'
374+
step='5'
375+
ref='scheduleEnd'
376+
onChange={e => this.handleSlider(e, 1)}
377+
/>
363378
</div>
364379
<div styleName='range-slider' id='secondRow'>
365-
<span id='rs-bullet-2' styleName='rs-label'>{`Start: ${this.formatTime(config.ui.scheduleStart)}`}</span>
366-
<input id='rs-range-line-2' styleName='rs-range' type='range' value={config.ui.scheduleStart} min='0' max='1440' step='5' ref='scheduleStart'
367-
onChange={(e) => this.handleSlider(e, 2)} />
380+
<span
381+
id='rs-bullet-2'
382+
styleName='rs-label'
383+
>{`Start: ${this.formatTime(config.ui.scheduleStart)}`}</span>
384+
<input
385+
id='rs-range-line-2'
386+
styleName='rs-range'
387+
type='range'
388+
value={config.ui.scheduleStart}
389+
min='0'
390+
max='1440'
391+
step='5'
392+
ref='scheduleStart'
393+
onChange={e => this.handleSlider(e, 2)}
394+
/>
368395
</div>
369396
<div styleName='box-minmax'>
370-
<span>00:00</span><span>24:00</span>
397+
<span>00:00</span>
398+
<span>24:00</span>
371399
</div>
372400
</div>
373401
</div>

‎tests/lib/themeManager-test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ test.beforeEach(t => {
1515
}
1616
const constantDate = new Date('2017-11-27T14:33:42Z')
1717
global.Date = class extends Date {
18-
constructor () {
18+
constructor() {
1919
super()
2020
return constantDate
2121
}
@@ -26,7 +26,7 @@ test.afterEach(t => {
2626
global.Date = originalDate
2727
})
2828

29-
test('enableScheduleTheme is false, theme shouldn\'t change', t => {
29+
test("enableScheduleTheme is false, theme shouldn't change", t => {
3030
t.context.enableScheduleTheme = false
3131

3232
const beforeTheme = t.context.theme
@@ -37,7 +37,7 @@ test('enableScheduleTheme is false, theme shouldn\'t change', t => {
3737
})
3838

3939
// NOT IN SCHEDULE
40-
test('scheduleEnd is bigger than scheduleStart and not in schedule, theme shouldn\'t change', t => {
40+
test("scheduleEnd is bigger than scheduleStart and not in schedule, theme shouldn't change", t => {
4141
const beforeTheme = t.context.defaultTheme
4242
t.context.scheduleStart = 720 // 12:00
4343
t.context.scheduleEnd = 870 // 14:30
@@ -47,7 +47,7 @@ test('scheduleEnd is bigger than scheduleStart and not in schedule, theme should
4747
t.is(afterTheme, beforeTheme)
4848
})
4949

50-
test('scheduleStart is bigger than scheduleEnd and not in schedule, theme shouldn\'t change', t => {
50+
test("scheduleStart is bigger than scheduleEnd and not in schedule, theme shouldn't change", t => {
5151
const beforeTheme = t.context.defaultTheme
5252
t.context.scheduleStart = 960 // 16:00
5353
t.context.scheduleEnd = 600 // 10:00
@@ -78,7 +78,7 @@ test('scheduleStart is bigger than scheduleEnd and in schedule, theme should cha
7878
t.is(afterTheme, beforeTheme)
7979
})
8080

81-
test('theme to apply is not a supported theme, theme shouldn\'t change', t => {
81+
test("theme to apply is not a supported theme, theme shouldn't change", t => {
8282
applyTheme('notATheme')
8383
const afterTheme = document.body.dataset.theme
8484

0 commit comments

Comments
 (0)