summaryrefslogtreecommitdiff
path: root/packages/client/src/components
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-01-28 11:53:12 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2022-01-28 11:53:12 +0900
commitb946d89ec1bfb3f10fd0f1c13cc160ac202a6e5d (patch)
tree8ab50127e7d79b36266a2f8f7ea3b87eeb82cfd0 /packages/client/src/components
parentrefactor(client): i18n.locale -> i18n.ts (diff)
downloadmisskey-b946d89ec1bfb3f10fd0f1c13cc160ac202a6e5d.tar.gz
misskey-b946d89ec1bfb3f10fd0f1c13cc160ac202a6e5d.tar.bz2
misskey-b946d89ec1bfb3f10fd0f1c13cc160ac202a6e5d.zip
refactor(client): better semantics
Diffstat (limited to 'packages/client/src/components')
-rw-r--r--packages/client/src/components/drive.file.vue2
-rw-r--r--packages/client/src/components/drive.vue2
-rw-r--r--packages/client/src/components/emoji-picker.vue2
-rw-r--r--packages/client/src/components/global/header.vue4
-rw-r--r--packages/client/src/components/page-window.vue2
-rw-r--r--packages/client/src/components/post-form-attaches.vue2
-rw-r--r--packages/client/src/components/post-form.vue6
-rw-r--r--packages/client/src/components/sample.vue2
8 files changed, 11 insertions, 11 deletions
diff --git a/packages/client/src/components/drive.file.vue b/packages/client/src/components/drive.file.vue
index 669c0d7db1..209e9b7c47 100644
--- a/packages/client/src/components/drive.file.vue
+++ b/packages/client/src/components/drive.file.vue
@@ -95,7 +95,7 @@ function onClick(ev: MouseEvent) {
if (props.selectMode) {
emit('chosen', props.file);
} else {
- os.popupMenu(getMenu(), (ev.currentTarget || ev.target || undefined) as HTMLElement | undefined);
+ os.popupMenu(getMenu(), (ev.currentTarget ?? ev.target || undefined) as HTMLElement | undefined);
}
}
diff --git a/packages/client/src/components/drive.vue b/packages/client/src/components/drive.vue
index b706839540..0d3f29d4c3 100644
--- a/packages/client/src/components/drive.vue
+++ b/packages/client/src/components/drive.vue
@@ -591,7 +591,7 @@ function getMenu() {
}
function showMenu(ev: MouseEvent) {
- os.popupMenu(getMenu(), (ev.currentTarget || ev.target || undefined) as HTMLElement | undefined);
+ os.popupMenu(getMenu(), (ev.currentTarget ?? ev.target || undefined) as HTMLElement | undefined);
}
function onContextmenu(ev: MouseEvent) {
diff --git a/packages/client/src/components/emoji-picker.vue b/packages/client/src/components/emoji-picker.vue
index f291510555..6999ad6517 100644
--- a/packages/client/src/components/emoji-picker.vue
+++ b/packages/client/src/components/emoji-picker.vue
@@ -280,7 +280,7 @@ function getKey(emoji: string | Misskey.entities.CustomEmoji | UnicodeEmojiDef):
}
function chosen(emoji: any, ev?: MouseEvent) {
- const el = ev && (ev.currentTarget || ev.target) as HTMLElement | null | undefined;
+ const el = ev && (ev.currentTarget ?? ev.target) as HTMLElement | null | undefined;
if (el) {
const rect = el.getBoundingClientRect();
const x = rect.left + (el.offsetWidth / 2);
diff --git a/packages/client/src/components/global/header.vue b/packages/client/src/components/global/header.vue
index 02598d95b3..e558614c12 100644
--- a/packages/client/src/components/global/header.vue
+++ b/packages/client/src/components/global/header.vue
@@ -113,7 +113,7 @@ export default defineComponent({
if (menu.length > 0) menu.push(null);
menu = menu.concat(props.menu);
}
- popupMenu(menu, ev.currentTarget || ev.target);
+ popupMenu(menu, ev.currentTarget ?? ev.target);
};
const showTabsPopup = (ev: MouseEvent) => {
@@ -126,7 +126,7 @@ export default defineComponent({
icon: tab.icon,
action: tab.onClick,
}));
- popupMenu(menu, ev.currentTarget || ev.target);
+ popupMenu(menu, ev.currentTarget ?? ev.target);
};
const preventDrag = (ev: TouchEvent) => {
diff --git a/packages/client/src/components/page-window.vue b/packages/client/src/components/page-window.vue
index ec7451d5aa..7455236bad 100644
--- a/packages/client/src/components/page-window.vue
+++ b/packages/client/src/components/page-window.vue
@@ -160,7 +160,7 @@ export default defineComponent({
action: () => {
copyToClipboard(this.url);
}
- }], ev.currentTarget || ev.target);
+ }], ev.currentTarget ?? ev.target);
},
back() {
diff --git a/packages/client/src/components/post-form-attaches.vue b/packages/client/src/components/post-form-attaches.vue
index 0c8181b481..9dd69a0ee5 100644
--- a/packages/client/src/components/post-form-attaches.vue
+++ b/packages/client/src/components/post-form-attaches.vue
@@ -127,7 +127,7 @@ export default defineComponent({
text: this.$ts.attachCancel,
icon: 'fas fa-times-circle',
action: () => { this.detachMedia(file.id) }
- }], ev.currentTarget || ev.target).then(() => this.menu = null);
+ }], ev.currentTarget ?? ev.target).then(() => this.menu = null);
}
}
});
diff --git a/packages/client/src/components/post-form.vue b/packages/client/src/components/post-form.vue
index a8882fc05f..8c5027f8e7 100644
--- a/packages/client/src/components/post-form.vue
+++ b/packages/client/src/components/post-form.vue
@@ -342,7 +342,7 @@ function focus() {
}
function chooseFileFrom(ev) {
- selectFiles(ev.currentTarget || ev.target, i18n.ts.attachFile).then(files_ => {
+ selectFiles(ev.currentTarget ?? ev.target, i18n.ts.attachFile).then(files_ => {
for (const file of files_) {
files.push(file);
}
@@ -592,7 +592,7 @@ function insertMention() {
}
async function insertEmoji(ev: MouseEvent) {
- os.openEmojiPicker(ev.currentTarget || ev.target, {}, textareaEl);
+ os.openEmojiPicker(ev.currentTarget ?? ev.target, {}, textareaEl);
}
function showActions(ev) {
@@ -605,7 +605,7 @@ function showActions(ev) {
if (key === 'text') { text = value; }
});
}
- })), ev.currentTarget || ev.target);
+ })), ev.currentTarget ?? ev.target);
}
let postAccount = $ref<misskey.entities.UserDetailed | null>(null);
diff --git a/packages/client/src/components/sample.vue b/packages/client/src/components/sample.vue
index 03ad6a9838..65249ff7e9 100644
--- a/packages/client/src/components/sample.vue
+++ b/packages/client/src/components/sample.vue
@@ -109,7 +109,7 @@ export default defineComponent({
text: 'Delete some bananas',
danger: true,
action: () => {},
- }], ev.currentTarget || ev.target);
+ }], ev.currentTarget ?? ev.target);
},
}
});