Merge branch 'fix-otp-login-kbd' into 'develop'

Fix #1033 as well as other (potential) similar issues

Closes #1033

See merge request pleroma/pleroma-fe!1338
This commit is contained in:
HJ 2021-02-03 06:23:35 +00:00
commit 6f3acb3c1b
7 changed files with 16 additions and 1 deletions

View file

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

View file

@ -26,6 +26,7 @@
<button <button
class="button-unstyled -link" class="button-unstyled -link"
@click.prevent="requireTOTP" @click.prevent="requireTOTP"
type="button"
> >
{{ $t('login.enter_two_factor_code') }} {{ $t('login.enter_two_factor_code') }}
</button> </button>
@ -33,6 +34,7 @@
<button <button
class="button-unstyled -link" class="button-unstyled -link"
@click.prevent="abortMFA" @click.prevent="abortMFA"
type="button"
> >
{{ $t('general.cancel') }} {{ $t('general.cancel') }}
</button> </button>

View file

@ -28,6 +28,7 @@
<button <button
class="button-unstyled -link" class="button-unstyled -link"
@click.prevent="requireRecovery" @click.prevent="requireRecovery"
type="button"
> >
{{ $t('login.enter_recovery_code') }} {{ $t('login.enter_recovery_code') }}
</button> </button>
@ -35,6 +36,7 @@
<button <button
class="button-unstyled -link" class="button-unstyled -link"
@click.prevent="abortMFA" @click.prevent="abortMFA"
type="button"
> >
{{ $t('general.cancel') }} {{ $t('general.cancel') }}
</button> </button>

View file

@ -9,6 +9,7 @@
:class="css.direct" :class="css.direct"
:title="$t('post_status.scope.direct')" :title="$t('post_status.scope.direct')"
@click="changeVis('direct')" @click="changeVis('direct')"
type="button"
> >
<FAIcon <FAIcon
icon="envelope" icon="envelope"
@ -21,6 +22,7 @@
:class="css.private" :class="css.private"
:title="$t('post_status.scope.private')" :title="$t('post_status.scope.private')"
@click="changeVis('private')" @click="changeVis('private')"
type="button"
> >
<FAIcon <FAIcon
icon="lock" icon="lock"
@ -33,6 +35,7 @@
:class="css.unlisted" :class="css.unlisted"
:title="$t('post_status.scope.unlisted')" :title="$t('post_status.scope.unlisted')"
@click="changeVis('unlisted')" @click="changeVis('unlisted')"
type="button"
> >
<FAIcon <FAIcon
icon="lock-open" icon="lock-open"
@ -45,6 +48,7 @@
:class="css.public" :class="css.public"
:title="$t('post_status.scope.public')" :title="$t('post_status.scope.public')"
@click="changeVis('public')" @click="changeVis('public')"
type="button"
> >
<FAIcon <FAIcon
icon="globe" icon="globe"

View file

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

View file

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

View file

@ -93,7 +93,9 @@ export default Vue.component('tab-switcher', {
<button <button
disabled={slot.data.attrs.disabled} disabled={slot.data.attrs.disabled}
onClick={this.clickTab(index)} onClick={this.clickTab(index)}
class={classesTab.join(' ')}> class={classesTab.join(' ')}
type="button"
>
<img src={slot.data.attrs.image} title={slot.data.attrs['image-tooltip']}/> <img src={slot.data.attrs.image} title={slot.data.attrs['image-tooltip']}/>
{slot.data.attrs.label ? '' : slot.data.attrs.label} {slot.data.attrs.label ? '' : slot.data.attrs.label}
</button> </button>