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 <carl@carlschwan.eu>
This commit is contained in:
Carl Schwan 2022-05-23 14:53:56 +02:00
parent 45a75c631e
commit 6d883a8572
18 changed files with 19 additions and 19 deletions

View File

@ -6,6 +6,7 @@ node_modules/
**/js/* **/js/*
*.config.js *.config.js
tests/lib/ tests/lib/
apps-extra
# TODO: remove when comments files is not using handlebar templates anymore # TODO: remove when comments files is not using handlebar templates anymore
apps/comments/src/templates.js apps/comments/src/templates.js

View File

@ -124,6 +124,6 @@ export default {
console.error(errorMessage, error) console.error(errorMessage, error)
} }
}, },
} },
} }
</script> </script>

View File

@ -117,7 +117,7 @@ window.addEventListener('DOMContentLoaded', () => {
}, },
error: () => { error: () => {
OC.msg.finishedError('#publicShareDisclaimerStatus', t('settings', 'Not saved')) OC.msg.finishedError('#publicShareDisclaimerStatus', t('settings', 'Not saved'))
} },
} }
OC.msg.startSaving('#publicShareDisclaimerStatus') OC.msg.startSaving('#publicShareDisclaimerStatus')
@ -194,7 +194,7 @@ window.addEventListener('DOMContentLoaded', () => {
}, },
error: (xhr) => { error: (xhr) => {
OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON) OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON)
} },
}) })
} }
@ -214,7 +214,7 @@ window.addEventListener('DOMContentLoaded', () => {
}, },
error: (xhr) => { error: (xhr) => {
OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON) OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON)
} },
}) })
} }
@ -239,7 +239,7 @@ window.addEventListener('DOMContentLoaded', () => {
}, },
error: (xhr) => { error: (xhr) => {
OC.msg.finishedError('#sendtestmail_msg', xhr.responseJSON) OC.msg.finishedError('#sendtestmail_msg', xhr.responseJSON)
} },
}) })
}) })

View File

@ -2,5 +2,5 @@ import rebuildNavigation from './service/rebuild-navigation.js'
window.OC.Settings = window.OC.Settings || {} window.OC.Settings = window.OC.Settings || {}
window.OC.Settings.Apps = window.OC.Settings.Apps || { window.OC.Settings.Apps = window.OC.Settings.Apps || {
rebuildNavigation rebuildNavigation,
} }

View File

@ -24,7 +24,6 @@
<SettingsSection :title="t('settings', 'Background jobs')" <SettingsSection :title="t('settings', 'Background jobs')"
:description="t('settings', `For the server to work properly, it's important to configure background jobs correctly. Cron is the recommended setting. Please see the documentation for more information.`)" :description="t('settings', `For the server to work properly, it's important to configure background jobs correctly. Cron is the recommended setting. Please see the documentation for more information.`)"
:doc-url="backgroundJobsDocUrl"> :doc-url="backgroundJobsDocUrl">
<template v-if="lastCron !== 0"> <template v-if="lastCron !== 0">
<span v-if="oldExecution" class="error"> <span v-if="oldExecution" class="error">
{{ t('settings', 'Last job execution ran {time}. Something seems wrong.', {time: relativeTime}) }} {{ t('settings', 'Last job execution ran {time}. Something seems wrong.', {time: relativeTime}) }}
@ -34,7 +33,7 @@
{{ t('settings', "Some jobs havent been executed since {maxAgeRelativeTime}. Please consider increasing the execution frequency.", {maxAgeRelativeTime}) }} {{ t('settings', "Some jobs havent been executed since {maxAgeRelativeTime}. Please consider increasing the execution frequency.", {maxAgeRelativeTime}) }}
</span> </span>
<span class="warning" v-else-if="longExecutionCron"> <span v-else-if="longExecutionCron" class="warning">
{{ t('settings', "Some jobs havent been executed since {maxAgeRelativeTime}. Please consider switching to system cron.", {maxAgeRelativeTime}) }} {{ t('settings', "Some jobs havent been executed since {maxAgeRelativeTime}. Please consider switching to system cron.", {maxAgeRelativeTime}) }}
</span> </span>
@ -43,7 +42,7 @@
</span> </span>
</template> </template>
<span class="error" v-else> <span v-else class="error">
{{ t('settings', 'Background job didnt run yet!') }} {{ t('settings', 'Background job didnt run yet!') }}
</span> </span>
@ -66,11 +65,11 @@
</CheckboxRadioSwitch> </CheckboxRadioSwitch>
<em>{{ t('settings', 'cron.php is registered at a webcron service to call cron.php every 5 minutes over HTTP. Use case: Very small instance (15 users depending on the usage).') }}</em> <em>{{ t('settings', 'cron.php is registered at a webcron service to call cron.php every 5 minutes over HTTP. Use case: Very small instance (15 users depending on the usage).') }}</em>
<CheckboxRadioSwitch type="radio" <CheckboxRadioSwitch v-if="cliBasedCronPossible"
type="radio"
:checked.sync="backgroundJobsMode" :checked.sync="backgroundJobsMode"
value="cron" value="cron"
name="backgroundJobsMode" name="backgroundJobsMode"
v-if="cliBasedCronPossible"
@update:checked="onBackgroundJobModeChanged"> @update:checked="onBackgroundJobModeChanged">
{{ t('settings', 'Cron (Recommended)') }} {{ t('settings', 'Cron (Recommended)') }}
</CheckboxRadioSwitch> </CheckboxRadioSwitch>
@ -137,7 +136,7 @@ export default {
}, },
longExecutionCron() { longExecutionCron() {
return Date.now() / 1000 - this.cronMaxAge > 12 * 3600 && this.backgroundJobsMode === 'cron' return Date.now() / 1000 - this.cronMaxAge > 12 * 3600 && this.backgroundJobsMode === 'cron'
} },
}, },
methods: { methods: {
async onBackgroundJobModeChanged(backgroundJobsMode) { async onBackgroundJobModeChanged(backgroundJobsMode) {
@ -150,10 +149,10 @@ export default {
try { try {
const { data } = await axios.post(url, { const { data } = await axios.post(url, {
value: backgroundJobsMode value: backgroundJobsMode,
}) })
this.handleResponse({ this.handleResponse({
status: data.ocs?.meta?.status status: data.ocs?.meta?.status,
}) })
} catch (e) { } catch (e) {
this.handleResponse({ this.handleResponse({
@ -184,7 +183,7 @@ export default {
} catch (error) { } catch (error) {
console.error(error) console.error(error)
} }
} },
}, },
} }
</script> </script>

View File

@ -71,7 +71,7 @@ export default {
value: stringValue, value: stringValue,
}) })
this.handleResponse({ this.handleResponse({
status: data.ocs?.meta?.status status: data.ocs?.meta?.status,
}) })
} catch (e) { } catch (e) {
this.handleResponse({ this.handleResponse({
@ -86,6 +86,6 @@ export default {
console.error(errorMessage, error) console.error(errorMessage, error)
} }
}, },
} },
} }
</script> </script>

View File

@ -52,7 +52,7 @@
// done if handling the event with the file list already // done if handling the event with the file list already
// created. // created.
shown: true, shown: true,
systemTagIds: initialTags systemTagIds: initialTags,
} }
) )

View File

@ -41,7 +41,7 @@ const propsData = {
preloadedUserStatus: { preloadedUserStatus: {
message: userStatusData.message, message: userStatusData.message,
icon: userStatusData.icon, icon: userStatusData.icon,
status: userStatusData.status status: userStatusData.status,
}, },
user: avatarDiv.dataset.user, user: avatarDiv.dataset.user,
displayName: avatarDiv.dataset.displayname, displayName: avatarDiv.dataset.displayname,

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.