natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

This commit is contained in:
tamaina 2023-01-15 16:32:37 +00:00
parent 9385767b12 7795ff0c95
commit c46b45a467
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue
View File

@ -37,20 +37,16 @@ const emit = defineEmits<{
let id: any = $ref(props.modelValue.note); let id: any = $ref(props.modelValue.note);
let note: any = $ref(null); let note: any = $ref(null);
watch(id, async () => { watch($$(id), async () => {
if (id && (id.startsWith('http://') || id.startsWith('https://'))) { if (id && (id.startsWith('http://') || id.startsWith('https://'))) {
emit('update:modelValue', { id = (id.endsWith('/') ? id.slice(0, -1) : id).split('/').pop();
...props.modelValue, }
note: (id.endsWith('/') ? id.slice(0, -1) : id).split('/').pop(),
});
} else {
emit('update:modelValue', { emit('update:modelValue', {
...props.modelValue, ...props.modelValue,
note: id, note: id,
}); });
} note = await os.api('notes/show', { noteId: id });
note = await os.api('notes/show', { noteId: props.modelValue.note });
}, { }, {
immediate: true, immediate: true,
}); });