diff options
Diffstat (limited to 'src/web/app/common')
| -rw-r--r-- | src/web/app/common/views/components/signin.vue | 2 | ||||
| -rw-r--r-- | src/web/app/common/views/components/signup.vue | 2 | ||||
| -rw-r--r-- | src/web/app/common/views/directives/autocomplete.ts | 2 | ||||
| -rw-r--r-- | src/web/app/common/views/widgets/version.vue | 7 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/web/app/common/views/components/signin.vue b/src/web/app/common/views/components/signin.vue index 2434684085..273143262b 100644 --- a/src/web/app/common/views/components/signin.vue +++ b/src/web/app/common/views/components/signin.vue @@ -1,7 +1,7 @@ <template> <form class="mk-signin" :class="{ signing }" @submit.prevent="onSubmit"> <label class="user-name"> - <input v-model="username" type="text" pattern="^[a-zA-Z0-9-]+$" placeholder="%i18n:common.tags.mk-signin.username%" autofocus required @change="onUsernameChange"/>%fa:at% + <input v-model="username" type="text" pattern="^[a-zA-Z0-9_]+$" placeholder="%i18n:common.tags.mk-signin.username%" autofocus required @change="onUsernameChange"/>%fa:at% </label> <label class="password"> <input v-model="password" type="password" placeholder="%i18n:common.tags.mk-signin.password%" required/>%fa:lock% diff --git a/src/web/app/common/views/components/signup.vue b/src/web/app/common/views/components/signup.vue index c2e78aa8a3..e77d849ade 100644 --- a/src/web/app/common/views/components/signup.vue +++ b/src/web/app/common/views/components/signup.vue @@ -2,7 +2,7 @@ <form class="mk-signup" @submit.prevent="onSubmit" autocomplete="off"> <label class="username"> <p class="caption">%fa:at%%i18n:common.tags.mk-signup.username%</p> - <input v-model="username" type="text" pattern="^[a-zA-Z0-9-]{3,20}$" placeholder="a~z、A~Z、0~9、-" autocomplete="off" required @input="onChangeUsername"/> + <input v-model="username" type="text" pattern="^[a-zA-Z0-9_]{3,20}$" placeholder="a~z、A~Z、0~9、-" autocomplete="off" required @input="onChangeUsername"/> <p class="profile-page-url-preview" v-if="shouldShowProfileUrl">{{ `${url}/@${username}` }}</p> <p class="info" v-if="usernameState == 'wait'" style="color:#999">%fa:spinner .pulse .fw%%i18n:common.tags.mk-signup.checking%</p> <p class="info" v-if="usernameState == 'ok'" style="color:#3CB7B5">%fa:check .fw%%i18n:common.tags.mk-signup.available%</p> diff --git a/src/web/app/common/views/directives/autocomplete.ts b/src/web/app/common/views/directives/autocomplete.ts index 3440c4212a..94635d301a 100644 --- a/src/web/app/common/views/directives/autocomplete.ts +++ b/src/web/app/common/views/directives/autocomplete.ts @@ -77,7 +77,7 @@ class Autocomplete { if (mentionIndex != -1 && mentionIndex > emojiIndex) { const username = text.substr(mentionIndex + 1); - if (username != '' && username.match(/^[a-zA-Z0-9-]+$/)) { + if (username != '' && username.match(/^[a-zA-Z0-9_]+$/)) { this.open('user', username); opened = true; } diff --git a/src/web/app/common/views/widgets/version.vue b/src/web/app/common/views/widgets/version.vue index 5072d9b74a..30b632b396 100644 --- a/src/web/app/common/views/widgets/version.vue +++ b/src/web/app/common/views/widgets/version.vue @@ -1,16 +1,17 @@ <template> -<p>ver {{ v }} (葵 aoi)</p> +<p>ver {{ version }} ({{ codename }})</p> </template> <script lang="ts"> -import { version } from '../../../config'; +import { version, codename } from '../../../config'; import define from '../../../common/define-widget'; export default define({ name: 'version' }).extend({ data() { return { - v: version + version, + codename }; } }); |