From 6d883a8572bb26c55d419afaf46f889419f325b3 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Mon, 23 May 2022 14:53:56 +0200 Subject: [PATCH] Fix various errors reported by eslint And also make sure eslint doesn't try to index apps-extra that contains other repo with not necessarely the same eslint rules Signed-off-by: Carl Schwan --- .eslintignore | 1 + .../src/components/AdminSettings.vue | 2 +- apps/settings/src/admin.js | 8 ++++---- apps/settings/src/apps.js | 2 +- .../BasicSettings/BackgroundJob.vue | 17 ++++++++--------- .../src/components/AdminSettings.vue | 4 ++-- apps/systemtags/src/app.js | 2 +- apps/user_status/src/menu.js | 2 +- ...federatedfilesharing-vue-settings-admin.js | Bin 7741 -> 7741 bytes ...ratedfilesharing-vue-settings-admin.js.map | Bin 24575 -> 24576 bytes dist/settings-apps.js.map | Bin 18455 -> 18456 bytes dist/settings-legacy-admin.js.map | Bin 20246 -> 20250 bytes ...tings-vue-settings-admin-basic-settings.js | Bin 21854 -> 21852 bytes ...s-vue-settings-admin-basic-settings.js.map | Bin 66213 -> 66212 bytes ...rebymail-vue-settings-admin-sharebymail.js | Bin 4842 -> 4842 bytes ...mail-vue-settings-admin-sharebymail.js.map | Bin 18058 -> 18060 bytes dist/systemtags-systemtags.js.map | Bin 46644 -> 46645 bytes dist/user_status-menu.js.map | Bin 85391 -> 85392 bytes 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.eslintignore b/.eslintignore index b40dce6c6aa..104bf398964 100644 --- a/.eslintignore +++ b/.eslintignore @@ -6,6 +6,7 @@ node_modules/ **/js/* *.config.js tests/lib/ +apps-extra # TODO: remove when comments files is not using handlebar templates anymore apps/comments/src/templates.js \ No newline at end of file diff --git a/apps/federatedfilesharing/src/components/AdminSettings.vue b/apps/federatedfilesharing/src/components/AdminSettings.vue index cd0f6e5beb6..b3fb2a7675b 100644 --- a/apps/federatedfilesharing/src/components/AdminSettings.vue +++ b/apps/federatedfilesharing/src/components/AdminSettings.vue @@ -124,6 +124,6 @@ export default { console.error(errorMessage, error) } }, - } + }, } diff --git a/apps/settings/src/admin.js b/apps/settings/src/admin.js index 833ed3e1ea9..eadc91c1759 100644 --- a/apps/settings/src/admin.js +++ b/apps/settings/src/admin.js @@ -117,7 +117,7 @@ window.addEventListener('DOMContentLoaded', () => { }, error: () => { OC.msg.finishedError('#publicShareDisclaimerStatus', t('settings', 'Not saved')) - } + }, } OC.msg.startSaving('#publicShareDisclaimerStatus') @@ -194,7 +194,7 @@ window.addEventListener('DOMContentLoaded', () => { }, error: (xhr) => { OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON) - } + }, }) } @@ -214,7 +214,7 @@ window.addEventListener('DOMContentLoaded', () => { }, error: (xhr) => { OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON) - } + }, }) } @@ -239,7 +239,7 @@ window.addEventListener('DOMContentLoaded', () => { }, error: (xhr) => { OC.msg.finishedError('#sendtestmail_msg', xhr.responseJSON) - } + }, }) }) diff --git a/apps/settings/src/apps.js b/apps/settings/src/apps.js index fafdb531399..61eea28f9d9 100644 --- a/apps/settings/src/apps.js +++ b/apps/settings/src/apps.js @@ -2,5 +2,5 @@ import rebuildNavigation from './service/rebuild-navigation.js' window.OC.Settings = window.OC.Settings || {} window.OC.Settings.Apps = window.OC.Settings.Apps || { - rebuildNavigation + rebuildNavigation, } diff --git a/apps/settings/src/components/BasicSettings/BackgroundJob.vue b/apps/settings/src/components/BasicSettings/BackgroundJob.vue index 5413db38f91..a785d585228 100644 --- a/apps/settings/src/components/BasicSettings/BackgroundJob.vue +++ b/apps/settings/src/components/BasicSettings/BackgroundJob.vue @@ -24,7 +24,6 @@ - - + {{ t('settings', 'Background job didn’t run yet!') }} @@ -66,11 +65,11 @@ {{ t('settings', 'cron.php is registered at a webcron service to call cron.php every 5 minutes over HTTP. Use case: Very small instance (1–5 users depending on the usage).') }} - {{ t('settings', 'Cron (Recommended)') }} @@ -137,7 +136,7 @@ export default { }, longExecutionCron() { return Date.now() / 1000 - this.cronMaxAge > 12 * 3600 && this.backgroundJobsMode === 'cron' - } + }, }, methods: { async onBackgroundJobModeChanged(backgroundJobsMode) { @@ -150,10 +149,10 @@ export default { try { const { data } = await axios.post(url, { - value: backgroundJobsMode + value: backgroundJobsMode, }) this.handleResponse({ - status: data.ocs?.meta?.status + status: data.ocs?.meta?.status, }) } catch (e) { this.handleResponse({ @@ -184,7 +183,7 @@ export default { } catch (error) { console.error(error) } - } + }, }, } diff --git a/apps/sharebymail/src/components/AdminSettings.vue b/apps/sharebymail/src/components/AdminSettings.vue index 29b7f051a4b..c84ded9bb2a 100644 --- a/apps/sharebymail/src/components/AdminSettings.vue +++ b/apps/sharebymail/src/components/AdminSettings.vue @@ -71,7 +71,7 @@ export default { value: stringValue, }) this.handleResponse({ - status: data.ocs?.meta?.status + status: data.ocs?.meta?.status, }) } catch (e) { this.handleResponse({ @@ -86,6 +86,6 @@ export default { console.error(errorMessage, error) } }, - } + }, } diff --git a/apps/systemtags/src/app.js b/apps/systemtags/src/app.js index e7e5fea5372..9696f1edbad 100644 --- a/apps/systemtags/src/app.js +++ b/apps/systemtags/src/app.js @@ -52,7 +52,7 @@ // done if handling the event with the file list already // created. shown: true, - systemTagIds: initialTags + systemTagIds: initialTags, } ) diff --git a/apps/user_status/src/menu.js b/apps/user_status/src/menu.js index c8d007d98a0..19d21939544 100644 --- a/apps/user_status/src/menu.js +++ b/apps/user_status/src/menu.js @@ -41,7 +41,7 @@ const propsData = { preloadedUserStatus: { message: userStatusData.message, icon: userStatusData.icon, - status: userStatusData.status + status: userStatusData.status, }, user: avatarDiv.dataset.user, displayName: avatarDiv.dataset.displayname, diff --git a/dist/federatedfilesharing-vue-settings-admin.js b/dist/federatedfilesharing-vue-settings-admin.js index 4e1864f5768178df3a8a2a863833eca4c329bc76..769008434876ca182bee12f8386ee16b895f0f7a 100644 GIT binary patch delta 47 ycmdmMv)5)qGpo6QnT6%X4i{MnYw|_e2$57X!?Yv|<5U9+qf|r76f@(*6f*#ANe)N= delta 47 ycmdmMv)5)qGpnJInWe$T4i{MnYw|_e2$4i%^Hc*P3nNP-!(R5Qc0Bn#tI0}G>6L(3F1L}T+*10xF~OC!T%3zH=CWD^UcjbZ;qI4up5Op{WKQ`IIf6qT6# lL0E3{6wxZ#&HTn68988bn>kD`sj?axnOPcaz8|H?3INmP8{_~0 diff --git a/dist/settings-apps.js.map b/dist/settings-apps.js.map index b5e13a00aebdee62aaf7fe59dcfaab06da24ea72..e949a9aa5b4a181e66c247ea65a104c8137d1105 100644 GIT binary patch delta 16 WcmbO}fpNwJ#tmZ9j5?cvgf0LsWdw2n delta 14 VcmbO+fpPi-#tmZ9o5iIWbpa;#1V#V= diff --git a/dist/settings-legacy-admin.js.map b/dist/settings-legacy-admin.js.map index fd75b9308da10a2a0864b901712bbb1e7d3acc6f..13c8acdee8e1551b6c579b70367250c673d00c16 100644 GIT binary patch delta 47 zcmbO>k8##K#tktVljY6XHz#RK;9=C+{K;e*6OigK=VE5mnXIoMF?oV6>*n=V=^_Av C-VaFt delta 41 ucmbO=k8#>O#tktVn`1Sm@k~DAA-tL0w3!Lam}mZ-X|le8#O8HYIU)d9n-A*% diff --git a/dist/settings-vue-settings-admin-basic-settings.js b/dist/settings-vue-settings-admin-basic-settings.js index 6705caf2357f2b75805b92a884651c3e107afceb..3b68d86d57673e21d3f9af7de5207b352fe6c0b7 100644 GIT binary patch delta 382 zcmcb&it)}W#tjz)Sc&#R$200$&Yv9V*~6;s xH>4v!vHo#?1mgw>Tid`Yt3!Bq`0pAjQNo)x^lcGTA)Mz|hbv6#&{ja#a8T delta 382 zcmcb!it*km#tjz)Sqx1r%qCwEyu_F`d7nx?YguBELegewVRI&+zzS7mAbCbrdGjpM zk1UKylY6A3C6aVp^&G<-LmY#2vY-r2oeYhn$@`^bfJ*L2DFDg8Qd(jlg|5Dio<2Zz zU>c&#R$200$&Yv9V*~6Od x>!?#cS>H>4v!vHo#?3rFcQ_!y`X(esB-PT~AkECu#3b1?(K0b5(bz002>?73aUTEx diff --git a/dist/settings-vue-settings-admin-basic-settings.js.map b/dist/settings-vue-settings-admin-basic-settings.js.map index 233e0ec112d183ea9592f606ddbc86a2791065e3..fa0670bd43ef08b04a69fab8bae38cdbbdd91ca8 100644 GIT binary patch delta 416 zcmZ45%Ce-DWrC|nQksQ9iiu^aiIIh6vU!?;p`lso#z;A7MzhTo(vKM#jW@^0KHwC} zt#op91QI&oj*f{szK*VjoBh-|`B_p8l2Rr!nuSf?XqLy3WMOV@WNeu_`M0_1WCs(W z$#Lf0aKX(V%|i<|d#rfGI9X?<UE?%)_j=38TI)O~7hD(FT()5i=VZD2(wl8| zB{MSWOrF0xbn?`R)tmG7>}8s~U@znwh1ENwR68WnxOAu~|~m#z;A7MvKiA(vKM#O*hBLKHwB8 ztaNg81QI&oj*f{szK*V@oBh-|`B{vUk`pI0nuSl^WR}ZeY-(m?U~FtW`M0_1WCs(W z$#Lf0aKX(V%|i<|yR3M^D43j+SX^uyqg0+)l$V*89-}l_eU-vw`PDL${Vz03&R8uz zS$3r`kY6JPQ<+*+lwTC1q)?`tnp2#*dE@G1%#)?pI8AO?!!h~Udc(5lIY~s6H_aC_zlzM T=g%sISqx1r%r>X|a^L^}y;6{z diff --git a/dist/sharebymail-vue-settings-admin-sharebymail.js b/dist/sharebymail-vue-settings-admin-sharebymail.js index 5bfa38aee58f348d905fc31ed108295af344809c..f22686cac126988f65423cd19329e27ba7a728e7 100644 GIT binary patch delta 47 ycmaE*`bu>|8>^AAnW^!{?$?44*5qoTXptmy6O$wZ%R~dSL?bg(Q$w>v<0Jrizz#0} delta 47 ycmaE*`bu>|8>^*}v602b?$?44*5qoTXp!VpBO^=Wq*Qa`R0CtnG}9DI0}B9u^bUXk diff --git a/dist/sharebymail-vue-settings-admin-sharebymail.js.map b/dist/sharebymail-vue-settings-admin-sharebymail.js.map index 5acd3eee387239991dc3d02a23c718b64e6bd718..5c3048474efeababd4970174911c6ca8b89f924e 100644 GIT binary patch delta 95 zcmeC`W$fu?oZu>wWNu=TWMG+SV3ufPW@>6^mS~)`F)~Vk)7-=`*~HkwKy7lMpv2@H s0nyDb1r`f3>TK>&YGDLY0xBOFIbe!5bE;{}uo@YgnHq1lbP8kv01?I+woN8obX`Ga5Zk%dhY?)@7VrgKpF)~Vk)5Ox)G$q-@NNsYUpv2@H p0nyDb1r`f#?p11G+$^N>k&y$YU^BOxwhXJKk+G4*W^1QF769e68btsA diff --git a/dist/systemtags-systemtags.js.map b/dist/systemtags-systemtags.js.map index 95386570a5550a949de7f4fedd82b8245afbd886..752aa7b9b83e166231100d91ce3700d3b53a0111 100644 GIT binary patch delta 16 Ycmdn;hH2{?rVY&&j5?c}EjHEy07LT!dH?_b delta 18 acmdn`hH1+irVY&&lNaU+Z=P;3uNDAW6A1zU diff --git a/dist/user_status-menu.js.map b/dist/user_status-menu.js.map index 6a53d41ab26e0a0bfea6f6595bec44a8f5dc464f..c3704b389e4ffa6a89820fbb01e1e4a5a91de94c 100644 GIT binary patch delta 16 YcmeC5%{pN=>jwVsj5?e7zc+*d069tq(f|Me delta 14 WcmbO*o3(#7>jwVsn+3i%gaH6B76zsO