summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2020-02-20 23:07:20 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2020-02-20 23:07:20 +0900
commit4263dbef31bb9abdc6f01bcdb38917bd9ff3b992 (patch)
tree69295a6934c2a2e060a1119900f4ff4cdc0d7657 /src
parentFix bug (diff)
downloadsharkey-4263dbef31bb9abdc6f01bcdb38917bd9ff3b992.tar.gz
sharkey-4263dbef31bb9abdc6f01bcdb38917bd9ff3b992.tar.bz2
sharkey-4263dbef31bb9abdc6f01bcdb38917bd9ff3b992.zip
Fix #6026
Diffstat (limited to 'src')
-rw-r--r--src/client/components/dialog.vue2
-rw-r--r--src/client/components/signin-dialog.vue6
-rw-r--r--src/client/pages/auth.vue4
3 files changed, 8 insertions, 4 deletions
diff --git a/src/client/components/dialog.vue b/src/client/components/dialog.vue
index ed740c1d8c..da8e54684b 100644
--- a/src/client/components/dialog.vue
+++ b/src/client/components/dialog.vue
@@ -55,6 +55,7 @@ import { faTimesCircle, faQuestionCircle } from '@fortawesome/free-regular-svg-i
import MkButton from './ui/button.vue';
import MkInput from './ui/input.vue';
import MkSelect from './ui/select.vue';
+import MkSignin from './signin.vue';
import parseAcct from '../../misc/acct/parse';
import i18n from '../i18n';
@@ -65,6 +66,7 @@ export default Vue.extend({
MkButton,
MkInput,
MkSelect,
+ MkSignin,
},
props: {
diff --git a/src/client/components/signin-dialog.vue b/src/client/components/signin-dialog.vue
index dbc63c93bf..a356c3ccdb 100644
--- a/src/client/components/signin-dialog.vue
+++ b/src/client/components/signin-dialog.vue
@@ -1,7 +1,7 @@
<template>
<x-window ref="window" @closed="() => { $emit('closed'); destroyDom(); }">
<template #header>{{ $t('login') }}</template>
- <x-signin :auto-set="autoSet" @login="onLogin"/>
+ <mk-signin :auto-set="autoSet" @login="onLogin"/>
</x-window>
</template>
@@ -9,13 +9,13 @@
import Vue from 'vue';
import i18n from '../i18n';
import XWindow from './window.vue';
-import XSignin from './signin.vue';
+import MkSignin from './signin.vue';
export default Vue.extend({
i18n,
components: {
- XSignin,
+ MkSignin,
XWindow,
},
diff --git a/src/client/pages/auth.vue b/src/client/pages/auth.vue
index 15ec81e019..8855948416 100644
--- a/src/client/pages/auth.vue
+++ b/src/client/pages/auth.vue
@@ -34,11 +34,13 @@
import Vue from 'vue';
import i18n from '../i18n';
import XForm from './auth.form.vue';
+import MkSignin from '../components/signin.vue';
export default Vue.extend({
i18n,
components: {
- XForm
+ XForm,
+ MkSignin,
},
data() {
return {