diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-01-07 14:59:54 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2023-01-07 14:59:54 +0900 |
| commit | d09e1f492577f5987f89b926646aaf8daf1726ef (patch) | |
| tree | 413f71163fb9cab1f10811f84ca9934fe6294bd6 /packages/frontend/src/components | |
| parent | fix #9483 (diff) | |
| download | sharkey-d09e1f492577f5987f89b926646aaf8daf1726ef.tar.gz sharkey-d09e1f492577f5987f89b926646aaf8daf1726ef.tar.bz2 sharkey-d09e1f492577f5987f89b926646aaf8daf1726ef.zip | |
refactor
Diffstat (limited to 'packages/frontend/src/components')
| -rw-r--r-- | packages/frontend/src/components/MkAbuseReport.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkAsUi.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkCheckbox.vue (renamed from packages/frontend/src/components/form/checkbox.vue) | 0 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkFormDialog.vue | 8 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkMenu.vue | 4 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkNotificationSettingWindow.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkPollEditor.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkSample.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkSignup.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkSwitch.vue (renamed from packages/frontend/src/components/form/switch.vue) | 0 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkTokenGenerateWindow.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/page/page.switch.vue | 2 |
12 files changed, 14 insertions, 14 deletions
diff --git a/packages/frontend/src/components/MkAbuseReport.vue b/packages/frontend/src/components/MkAbuseReport.vue index cdfe323d50..96f58269c4 100644 --- a/packages/frontend/src/components/MkAbuseReport.vue +++ b/packages/frontend/src/components/MkAbuseReport.vue @@ -37,7 +37,7 @@ <script lang="ts" setup> import MkButton from '@/components/MkButton.vue'; -import MkSwitch from '@/components/form/switch.vue'; +import MkSwitch from '@/components/MkSwitch.vue'; import MkKeyValue from '@/components/MkKeyValue.vue'; import { acct, userPage } from '@/filters/user'; import * as os from '@/os'; diff --git a/packages/frontend/src/components/MkAsUi.vue b/packages/frontend/src/components/MkAsUi.vue index e2d8c010a2..9115de93cc 100644 --- a/packages/frontend/src/components/MkAsUi.vue +++ b/packages/frontend/src/components/MkAsUi.vue @@ -52,7 +52,7 @@ import { computed, defineAsyncComponent, onMounted, onUnmounted, Ref } from 'vue import * as os from '@/os'; import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; -import MkSwitch from '@/components/form/switch.vue'; +import MkSwitch from '@/components/MkSwitch.vue'; import MkTextarea from '@/components/form/textarea.vue'; import MkSelect from '@/components/form/select.vue'; import { AsUiComponent } from '@/scripts/aiscript/ui'; diff --git a/packages/frontend/src/components/form/checkbox.vue b/packages/frontend/src/components/MkCheckbox.vue index a8e24dd839..a8e24dd839 100644 --- a/packages/frontend/src/components/form/checkbox.vue +++ b/packages/frontend/src/components/MkCheckbox.vue diff --git a/packages/frontend/src/components/MkFormDialog.vue b/packages/frontend/src/components/MkFormDialog.vue index 76c6c164d4..d9a07b45d4 100644 --- a/packages/frontend/src/components/MkFormDialog.vue +++ b/packages/frontend/src/components/MkFormDialog.vue @@ -29,10 +29,10 @@ <template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span></template> <template v-if="form[item].description" #caption>{{ form[item].description }}</template> </FormTextarea> - <FormSwitch v-else-if="form[item].type === 'boolean'" v-model="values[item]"> + <MkSwitch v-else-if="form[item].type === 'boolean'" v-model="values[item]"> <span v-text="form[item].label || item"></span> <template v-if="form[item].description" #caption>{{ form[item].description }}</template> - </FormSwitch> + </MkSwitch> <FormSelect v-else-if="form[item].type === 'enum'" v-model="values[item]"> <template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span></template> <option v-for="item in form[item].enum" :key="item.value" :value="item.value">{{ item.label }}</option> @@ -58,7 +58,7 @@ import { defineComponent } from 'vue'; import FormInput from './form/input.vue'; import FormTextarea from './form/textarea.vue'; -import FormSwitch from './form/switch.vue'; +import MkSwitch from './MkSwitch.vue'; import FormSelect from './form/select.vue'; import FormRange from './form/range.vue'; import MkButton from './MkButton.vue'; @@ -70,7 +70,7 @@ export default defineComponent({ MkModalWindow, FormInput, FormTextarea, - FormSwitch, + MkSwitch, FormSelect, FormRange, MkButton, diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue index e9076138c6..31a3f7f1c1 100644 --- a/packages/frontend/src/components/MkMenu.vue +++ b/packages/frontend/src/components/MkMenu.vue @@ -31,7 +31,7 @@ <span v-if="item.indicate" class="indicator"><i class="_indicatorCircle"></i></span> </button> <span v-else-if="item.type === 'switch'" :tabindex="i" class="item" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)"> - <FormSwitch v-model="item.ref" :disabled="item.disabled" class="form-switch">{{ item.text }}</FormSwitch> + <MkSwitch v-model="item.ref" :disabled="item.disabled" class="form-switch">{{ item.text }}</MkSwitch> </span> <button v-else-if="item.type === 'parent'" :tabindex="i" class="_button item parent" :class="{ childShowing: childShowingItem === item }" @mouseenter="showChildren(item, $event)"> <i v-if="item.icon" class="ti-fw" :class="item.icon"></i> @@ -58,7 +58,7 @@ <script lang="ts" setup> import { defineAsyncComponent, nextTick, onBeforeUnmount, onMounted, onUnmounted, Ref, ref, watch } from 'vue'; import { focusPrev, focusNext } from '@/scripts/focus'; -import FormSwitch from '@/components/form/switch.vue'; +import MkSwitch from '@/components/MkSwitch.vue'; import { MenuItem, InnerMenuItem, MenuPending, MenuAction } from '@/types/menu'; import * as os from '@/os'; import { i18n } from '@/i18n'; diff --git a/packages/frontend/src/components/MkNotificationSettingWindow.vue b/packages/frontend/src/components/MkNotificationSettingWindow.vue index cb054b1a29..e303403872 100644 --- a/packages/frontend/src/components/MkNotificationSettingWindow.vue +++ b/packages/frontend/src/components/MkNotificationSettingWindow.vue @@ -35,7 +35,7 @@ <script lang="ts" setup> import { } from 'vue'; import { notificationTypes } from 'misskey-js'; -import MkSwitch from './form/switch.vue'; +import MkSwitch from './MkSwitch.vue'; import MkInfo from './MkInfo.vue'; import MkButton from './MkButton.vue'; import MkModalWindow from '@/components/MkModalWindow.vue'; diff --git a/packages/frontend/src/components/MkPollEditor.vue b/packages/frontend/src/components/MkPollEditor.vue index 556abc5fd0..9eb45d0f9c 100644 --- a/packages/frontend/src/components/MkPollEditor.vue +++ b/packages/frontend/src/components/MkPollEditor.vue @@ -51,7 +51,7 @@ import { ref, watch } from 'vue'; import MkInput from './form/input.vue'; import MkSelect from './form/select.vue'; -import MkSwitch from './form/switch.vue'; +import MkSwitch from './MkSwitch.vue'; import MkButton from './MkButton.vue'; import { formatDateTimeString } from '@/scripts/format-time-string'; import { addTime } from '@/scripts/time'; diff --git a/packages/frontend/src/components/MkSample.vue b/packages/frontend/src/components/MkSample.vue index ded5ac3f7a..8d9b5d0205 100644 --- a/packages/frontend/src/components/MkSample.vue +++ b/packages/frontend/src/components/MkSample.vue @@ -31,7 +31,7 @@ import { defineComponent } from 'vue'; import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; -import MkSwitch from '@/components/form/switch.vue'; +import MkSwitch from '@/components/MkSwitch.vue'; import MkTextarea from '@/components/form/textarea.vue'; import MkRadio from '@/components/form/radio.vue'; import * as os from '@/os'; diff --git a/packages/frontend/src/components/MkSignup.vue b/packages/frontend/src/components/MkSignup.vue index dcffee47bd..da6464ed6a 100644 --- a/packages/frontend/src/components/MkSignup.vue +++ b/packages/frontend/src/components/MkSignup.vue @@ -70,7 +70,7 @@ import getPasswordStrength from 'syuilo-password-strength'; import { toUnicode } from 'punycode/'; import MkButton from './MkButton.vue'; import MkInput from './form/input.vue'; -import MkSwitch from './form/switch.vue'; +import MkSwitch from './MkSwitch.vue'; import MkCaptcha from '@/components/MkCaptcha.vue'; import * as config from '@/config'; import * as os from '@/os'; diff --git a/packages/frontend/src/components/form/switch.vue b/packages/frontend/src/components/MkSwitch.vue index 5c9e3a5223..5c9e3a5223 100644 --- a/packages/frontend/src/components/form/switch.vue +++ b/packages/frontend/src/components/MkSwitch.vue diff --git a/packages/frontend/src/components/MkTokenGenerateWindow.vue b/packages/frontend/src/components/MkTokenGenerateWindow.vue index 5e12aa8319..5b9badd6df 100644 --- a/packages/frontend/src/components/MkTokenGenerateWindow.vue +++ b/packages/frontend/src/components/MkTokenGenerateWindow.vue @@ -37,7 +37,7 @@ import { } from 'vue'; import { permissions as kinds } from 'misskey-js'; import MkInput from './form/input.vue'; -import MkSwitch from './form/switch.vue'; +import MkSwitch from './MkSwitch.vue'; import MkButton from './MkButton.vue'; import MkInfo from './MkInfo.vue'; import MkModalWindow from '@/components/MkModalWindow.vue'; diff --git a/packages/frontend/src/components/page/page.switch.vue b/packages/frontend/src/components/page/page.switch.vue index 64dc4ff8aa..d0d2637afa 100644 --- a/packages/frontend/src/components/page/page.switch.vue +++ b/packages/frontend/src/components/page/page.switch.vue @@ -6,7 +6,7 @@ <script lang="ts"> import { computed, defineComponent, PropType } from 'vue'; -import MkSwitch from '../form/switch.vue'; +import MkSwitch from '../MkSwitch.vue'; import * as os from '@/os'; import { Hpml } from '@/scripts/hpml/evaluator'; import { SwitchVarBlock } from '@/scripts/hpml/block'; |