Merge branch 'fix-vue-warnings-again' into 'develop'

fix vue warnings

See merge request pleroma/pleroma-fe!1356
This commit is contained in:
Shpuld Shpludson 2021-02-25 12:43:22 +00:00
commit dd9e18fd34
10 changed files with 31 additions and 31 deletions

View file

@ -9,8 +9,8 @@
<button <button
v-if="!hideEmojiButton" v-if="!hideEmojiButton"
class="button-unstyled emoji-picker-icon" class="button-unstyled emoji-picker-icon"
@click.prevent="togglePicker"
type="button" type="button"
@click.prevent="togglePicker"
> >
<FAIcon :icon="['far', 'smile-beam']" /> <FAIcon :icon="['far', 'smile-beam']" />
</button> </button>

View file

@ -25,16 +25,16 @@
<div> <div>
<button <button
class="button-unstyled -link" class="button-unstyled -link"
@click.prevent="requireTOTP"
type="button" type="button"
@click.prevent="requireTOTP"
> >
{{ $t('login.enter_two_factor_code') }} {{ $t('login.enter_two_factor_code') }}
</button> </button>
<br> <br>
<button <button
class="button-unstyled -link" class="button-unstyled -link"
@click.prevent="abortMFA"
type="button" type="button"
@click.prevent="abortMFA"
> >
{{ $t('general.cancel') }} {{ $t('general.cancel') }}
</button> </button>

View file

@ -27,16 +27,16 @@
<div> <div>
<button <button
class="button-unstyled -link" class="button-unstyled -link"
@click.prevent="requireRecovery"
type="button" type="button"
@click.prevent="requireRecovery"
> >
{{ $t('login.enter_recovery_code') }} {{ $t('login.enter_recovery_code') }}
</button> </button>
<br> <br>
<button <button
class="button-unstyled -link" class="button-unstyled -link"
@click.prevent="abortMFA"
type="button" type="button"
@click.prevent="abortMFA"
> >
{{ $t('general.cancel') }} {{ $t('general.cancel') }}
</button> </button>

View file

@ -6,8 +6,8 @@
<button <button
ref="trigger" ref="trigger"
class="button-unstyled -fullwidth popover-trigger-button" class="button-unstyled -fullwidth popover-trigger-button"
@click="onClick"
type="button" type="button"
@click="onClick"
> >
<slot name="trigger" /> <slot name="trigger" />
</button> </button>

View file

@ -8,8 +8,8 @@
class="button-unstyled scope" class="button-unstyled scope"
:class="css.direct" :class="css.direct"
:title="$t('post_status.scope.direct')" :title="$t('post_status.scope.direct')"
@click="changeVis('direct')"
type="button" type="button"
@click="changeVis('direct')"
> >
<FAIcon <FAIcon
icon="envelope" icon="envelope"
@ -21,8 +21,8 @@
class="button-unstyled scope" class="button-unstyled scope"
:class="css.private" :class="css.private"
:title="$t('post_status.scope.private')" :title="$t('post_status.scope.private')"
@click="changeVis('private')"
type="button" type="button"
@click="changeVis('private')"
> >
<FAIcon <FAIcon
icon="lock" icon="lock"
@ -34,8 +34,8 @@
class="button-unstyled scope" class="button-unstyled scope"
:class="css.unlisted" :class="css.unlisted"
:title="$t('post_status.scope.unlisted')" :title="$t('post_status.scope.unlisted')"
@click="changeVis('unlisted')"
type="button" type="button"
@click="changeVis('unlisted')"
> >
<FAIcon <FAIcon
icon="lock-open" icon="lock-open"
@ -47,8 +47,8 @@
class="button-unstyled scope" class="button-unstyled scope"
:class="css.public" :class="css.public"
:title="$t('post_status.scope.public')" :title="$t('post_status.scope.public')"
@click="changeVis('public')"
type="button" type="button"
@click="changeVis('public')"
> >
<FAIcon <FAIcon
icon="globe" icon="globe"

View file

@ -15,8 +15,8 @@
> >
<button <button
class="btn button-default search-button" class="btn button-default search-button"
@click="newQuery(searchTerm)"
type="submit" type="submit"
@click="newQuery(searchTerm)"
> >
<FAIcon icon="search" /> <FAIcon icon="search" />
</button> </button>

View file

@ -7,8 +7,8 @@
v-if="hidden" v-if="hidden"
class="button-unstyled nav-icon" class="button-unstyled nav-icon"
:title="$t('nav.search')" :title="$t('nav.search')"
@click.prevent.stop="toggleHidden"
type="button" type="button"
@click.prevent.stop="toggleHidden"
> >
<FAIcon <FAIcon
fixed-width fixed-width
@ -28,8 +28,8 @@
> >
<button <button
class="button-default search-button" class="button-default search-button"
@click="find(searchTerm)"
type="submit" type="submit"
@click="find(searchTerm)"
> >
<FAIcon <FAIcon
fixed-width fixed-width
@ -38,8 +38,8 @@
</button> </button>
<button <button
class="button-unstyled cancel-search" class="button-unstyled cancel-search"
@click.prevent.stop="toggleHidden"
type="button" type="button"
@click.prevent.stop="toggleHidden"
> >
<FAIcon <FAIcon
fixed-width fixed-width

View file

@ -4,13 +4,13 @@
> >
<Checkbox <Checkbox
:checked="state" :checked="state"
@change="update"
:disabled="disabled" :disabled="disabled"
@change="update"
> >
<span <span
v-if="!!$slots.default" v-if="!!$slots.default"
class="label" class="label"
> >
<slot /> <slot />
</span> </span>
<ModifiedIndicator :changed="isChanged" /> <ModifiedIndicator :changed="isChanged" />
@ -23,14 +23,14 @@ import { get, set } from 'lodash'
import Checkbox from 'src/components/checkbox/checkbox.vue' import Checkbox from 'src/components/checkbox/checkbox.vue'
import ModifiedIndicator from './modified_indicator.vue' import ModifiedIndicator from './modified_indicator.vue'
export default { export default {
props: [
'path',
'disabled'
],
components: { components: {
Checkbox, Checkbox,
ModifiedIndicator ModifiedIndicator
}, },
props: [
'path',
'disabled'
],
computed: { computed: {
pathDefault () { pathDefault () {
const [firstSegment, ...rest] = this.path.split('.') const [firstSegment, ...rest] = this.path.split('.')

View file

@ -2,21 +2,21 @@
<span <span
v-if="changed" v-if="changed"
class="ModifiedIndicator" class="ModifiedIndicator"
> >
<Popover <Popover
trigger="hover" trigger="hover"
> >
<span slot="trigger"> <span slot="trigger">
&nbsp; &nbsp;
<FAIcon <FAIcon
icon="wrench" icon="wrench"
/> />
</span> </span>
<div <div
class="modified-tooltip"
slot="content" slot="content"
> class="modified-tooltip"
{{ $t('settings.setting_changed') }} >
{{ $t('settings.setting_changed') }}
</div> </div>
</Popover> </Popover>
</span> </span>
@ -32,8 +32,8 @@ library.add(
) )
export default { export default {
props: ['changed'], components: { Popover },
components: { Popover } props: ['changed']
} }
</script> </script>

View file

@ -75,8 +75,8 @@
<p>{{ $t('settings.filtering_explanation') }}</p> <p>{{ $t('settings.filtering_explanation') }}</p>
<textarea <textarea
id="muteWords" id="muteWords"
class="resize-height"
v-model="muteWordsString" v-model="muteWordsString"
class="resize-height"
/> />
</div> </div>
<div> <div>