From 14d2364fc69e0222133115c55a36286986006098 Mon Sep 17 00:00:00 2001 From: Markus Hatvan Date: Fri, 15 Oct 2021 09:48:06 +0200 Subject: chore: update eslint setup (#2074) --- .../services/content/ErrorHandlers/styles.ts | 2 +- src/components/services/content/ServiceView.js | 2 +- src/components/services/content/ServiceWebview.js | 36 +++++++++++++--------- src/components/services/tabs/TabBarSortableList.js | 10 +++--- 4 files changed, 29 insertions(+), 21 deletions(-) (limited to 'src/components/services') diff --git a/src/components/services/content/ErrorHandlers/styles.ts b/src/components/services/content/ErrorHandlers/styles.ts index 72d62f5e3..9e2509ee5 100644 --- a/src/components/services/content/ErrorHandlers/styles.ts +++ b/src/components/services/content/ErrorHandlers/styles.ts @@ -1,4 +1,4 @@ -export default (theme) => ({ +export default theme => ({ component: { left: 0, position: 'absolute', diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index 8e44efc5f..1bc1fbf5f 100644 --- a/src/components/services/content/ServiceView.js +++ b/src/components/services/content/ServiceView.js @@ -123,7 +123,7 @@ class ServiceView extends Component { service.isFirstLoad && !service.isServiceAccessRestricted && ( - )} + )} {service.isError && ( ( - this.webview - ), + () => this.webview, () => { if (this.webview && this.webview.view) { - this.webview.view.addEventListener('console-message', (e) => { + this.webview.view.addEventListener('console-message', e => { debug('Service logged a message:', e.message); }); } @@ -55,20 +53,26 @@ class ServiceWebview extends Component { }; render() { - const { - service, - setWebviewReference, - isSpellcheckerEnabled, - } = this.props; + const { service, setWebviewReference, isSpellcheckerEnabled } = this.props; - const preloadScript = join(__dirname, '..', '..', '..', 'webview', 'recipe.js'); + const preloadScript = join( + __dirname, + '..', + '..', + '..', + 'webview', + 'recipe.js', + ); return ( { + ref={webview => { this.webview = webview; if (webview && webview.view) { - webview.view.addEventListener('did-stop-loading', this.refocusWebview); + webview.view.addEventListener( + 'did-stop-loading', + this.refocusWebview, + ); } }} autosize @@ -83,10 +87,14 @@ class ServiceWebview extends Component { }} onUpdateTargetUrl={this.updateTargetUrl} useragent={service.userAgent} - disablewebsecurity={service.recipe.disablewebsecurity ? true : undefined} + disablewebsecurity={ + service.recipe.disablewebsecurity ? true : undefined + } allowpopups nodeintegration - webpreferences={`spellcheck=${isSpellcheckerEnabled ? 1 : 0}, contextIsolation=1, enableRemoteModule=1`} + webpreferences={`spellcheck=${ + isSpellcheckerEnabled ? 1 : 0 + }, contextIsolation=1, enableRemoteModule=1`} /> ); } diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js index 146cd93eb..69a12e982 100644 --- a/src/components/services/tabs/TabBarSortableList.js +++ b/src/components/services/tabs/TabBarSortableList.js @@ -22,7 +22,7 @@ class TabBarSortableList extends Component { wakeUpService: PropTypes.func.isRequired, showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, - } + }; render() { const { @@ -43,9 +43,7 @@ class TabBarSortableList extends Component { } = this.props; return ( -
    +
      {services.map((service, index) => ( reload({ serviceId: service.id })} - toggleNotifications={() => toggleNotifications({ serviceId: service.id })} + toggleNotifications={() => + toggleNotifications({ serviceId: service.id }) + } toggleAudio={() => toggleAudio({ serviceId: service.id })} toggleDarkMode={() => toggleDarkMode({ serviceId: service.id })} deleteService={() => deleteService({ serviceId: service.id })} -- cgit v1.2.3-70-g09d2