sim1222/nca10.net
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor(client): better semantics

Browse Source
This commit is contained in:
syuilo
2022-01-28 11:53:12 +09:00
parent 57ec04d9ec
commit b946d89ec1
32 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/components/drive.file.vue
View File

@ -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);
}
}

2
packages/client/src/components/drive.vue
View File

@ -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) {

2
packages/client/src/components/emoji-picker.vue
View File

@ -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);

4
packages/client/src/components/global/header.vue
View File

@ -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) => {

2
packages/client/src/components/page-window.vue
View File

@ -160,7 +160,7 @@ export default defineComponent({
action: () => {
copyToClipboard(this.url);
}
}], ev.currentTarget || ev.target);
}], ev.currentTarget ?? ev.target);
},
back() {

2
packages/client/src/components/post-form-attaches.vue
View File

@ -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);
}
}
});

6
packages/client/src/components/post-form.vue
View File

@ -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);

2
packages/client/src/components/sample.vue
View File

@ -109,7 +109,7 @@ export default defineComponent({
text: 'Delete some bananas',
danger: true,
action: () => {},
}], ev.currentTarget || ev.target);
}], ev.currentTarget ?? ev.target);
},
}
});