From 9c3f34fe04ec4953c5f6a5e7e6cbe03c2fd830c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Santos?= Date: Tue, 25 Feb 2020 03:34:34 +0000 Subject: [PATCH] Fix Lint Errors --- browser/main/lib/ThemeManager.js | 19 +++-- browser/main/modals/PreferencesModal/UiTab.js | 70 +++++++++++++------ tests/lib/themeManager-test.js | 10 +-- 3 files changed, 68 insertions(+), 31 deletions(-) diff --git a/browser/main/lib/ThemeManager.js b/browser/main/lib/ThemeManager.js index a6be2f82..fa90def2 100644 --- a/browser/main/lib/ThemeManager.js +++ b/browser/main/lib/ThemeManager.js @@ -1,4 +1,4 @@ -const chooseTheme = (ui) => { +const chooseTheme = ui => { if (!ui.enableScheduleTheme) { return } @@ -11,9 +11,12 @@ const chooseTheme = (ui) => { const isEndAfterStart = end > start const isBetweenStartAndEnd = minutes >= start && minutes <= end - const isBetweenEndAndStart = (minutes >= start || minutes <= end) + const isBetweenEndAndStart = minutes >= start || minutes <= end - if ((isEndAfterStart && isBetweenStartAndEnd) || (!isEndAfterStart && isBetweenEndAndStart)) { + if ( + (isEndAfterStart && isBetweenStartAndEnd) || + (!isEndAfterStart && isBetweenEndAndStart) + ) { if (ui.theme !== ui.scheduledTheme) { ui.defaultTheme = ui.theme ui.theme = ui.scheduledTheme @@ -27,8 +30,14 @@ const chooseTheme = (ui) => { } } -const applyTheme = (theme) => { - const supportedThemes = ['dark', 'white', 'solarized-dark', 'monokai', 'dracula'] +const applyTheme = theme => { + const supportedThemes = [ + 'dark', + 'white', + 'solarized-dark', + 'monokai', + 'dracula' + ] if (supportedThemes.indexOf(theme) !== -1) { document.body.setAttribute('data-theme', theme) } else { diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js index d9f90790..15bafef1 100644 --- a/browser/main/modals/PreferencesModal/UiTab.js +++ b/browser/main/modals/PreferencesModal/UiTab.js @@ -219,7 +219,7 @@ class UiTab extends React.Component { * Gets the total number of minutes and returns a string in the HH:MM format * @param {Number} time total number of minutes */ - formatTime (time) { + formatTime(time) { let hour = Math.floor(time / 60) let minute = time % 60 @@ -234,7 +234,7 @@ class UiTab extends React.Component { return `${hour}:${minute}` } - handleSlider (e, number) { + handleSlider(e, number) { const sliderID = 'rs-range-line-' + number const bulletID = 'rs-bullet-' + number @@ -242,8 +242,9 @@ class UiTab extends React.Component { const rangeBullet = document.getElementById(bulletID) if (rangeSlider && rangeBullet) { - const bulletPosition = (rangeSlider.value / rangeSlider.max) - rangeBullet.style.left = (bulletPosition * 574) + 6 * (1 - bulletPosition) + 'px' + const bulletPosition = rangeSlider.value / rangeSlider.max + rangeBullet.style.left = + bulletPosition * 574 + 6 * (1 - bulletPosition) + 'px' } if (e) { @@ -251,7 +252,7 @@ class UiTab extends React.Component { } } - render () { + render() { const UiAlert = this.state.UiAlert const UiAlertElement = UiAlert != null ? ( @@ -274,8 +275,9 @@ class UiTab extends React.Component { {i18n.__('Interface Theme')}
- this.handleUIChange(e)} ref='uiTheme' > @@ -305,16 +307,16 @@ class UiTab extends React.Component {
-
- {i18n.__('Theme Schedule')} -
+
{i18n.__('Theme Schedule')}
@@ -323,8 +325,9 @@ class UiTab extends React.Component { {i18n.__('Scheduled Theme')}
- this.handleUIChange(e)} ref='uiScheduledTheme' > @@ -357,17 +360,42 @@ class UiTab extends React.Component {
- {`End: ${this.formatTime(config.ui.scheduleEnd)}`} - this.handleSlider(e, 1)} /> + {`End: ${this.formatTime(config.ui.scheduleEnd)}`} + this.handleSlider(e, 1)} + />
- {`Start: ${this.formatTime(config.ui.scheduleStart)}`} - this.handleSlider(e, 2)} /> + {`Start: ${this.formatTime(config.ui.scheduleStart)}`} + this.handleSlider(e, 2)} + />
- 00:0024:00 + 00:00 + 24:00
diff --git a/tests/lib/themeManager-test.js b/tests/lib/themeManager-test.js index 454fade7..49a4f300 100644 --- a/tests/lib/themeManager-test.js +++ b/tests/lib/themeManager-test.js @@ -15,7 +15,7 @@ test.beforeEach(t => { } const constantDate = new Date('2017-11-27T14:33:42Z') global.Date = class extends Date { - constructor () { + constructor() { super() return constantDate } @@ -26,7 +26,7 @@ test.afterEach(t => { global.Date = originalDate }) -test('enableScheduleTheme is false, theme shouldn\'t change', t => { +test("enableScheduleTheme is false, theme shouldn't change", t => { t.context.enableScheduleTheme = false const beforeTheme = t.context.theme @@ -37,7 +37,7 @@ test('enableScheduleTheme is false, theme shouldn\'t change', t => { }) // NOT IN SCHEDULE -test('scheduleEnd is bigger than scheduleStart and not in schedule, theme shouldn\'t change', t => { +test("scheduleEnd is bigger than scheduleStart and not in schedule, theme shouldn't change", t => { const beforeTheme = t.context.defaultTheme t.context.scheduleStart = 720 // 12:00 t.context.scheduleEnd = 870 // 14:30 @@ -47,7 +47,7 @@ test('scheduleEnd is bigger than scheduleStart and not in schedule, theme should t.is(afterTheme, beforeTheme) }) -test('scheduleStart is bigger than scheduleEnd and not in schedule, theme shouldn\'t change', t => { +test("scheduleStart is bigger than scheduleEnd and not in schedule, theme shouldn't change", t => { const beforeTheme = t.context.defaultTheme t.context.scheduleStart = 960 // 16:00 t.context.scheduleEnd = 600 // 10:00 @@ -78,7 +78,7 @@ test('scheduleStart is bigger than scheduleEnd and in schedule, theme should cha t.is(afterTheme, beforeTheme) }) -test('theme to apply is not a supported theme, theme shouldn\'t change', t => { +test("theme to apply is not a supported theme, theme shouldn't change", t => { applyTheme('notATheme') const afterTheme = document.body.dataset.theme