summaryrefslogtreecommitdiff
path: root/packages/frontend/src/utility/drive.ts
diff options
context:
space:
mode:
Diffstat (limited to 'packages/frontend/src/utility/drive.ts')
-rw-r--r--packages/frontend/src/utility/drive.ts14
1 files changed, 8 insertions, 6 deletions
diff --git a/packages/frontend/src/utility/drive.ts b/packages/frontend/src/utility/drive.ts
index 64079d125a..4fe2042e78 100644
--- a/packages/frontend/src/utility/drive.ts
+++ b/packages/frontend/src/utility/drive.ts
@@ -180,8 +180,9 @@ export function chooseFileFromPcAndUpload(
export function chooseDriveFile(options: {
multiple?: boolean;
} = {}): Promise<Misskey.entities.DriveFile[]> {
- return new Promise(async resolve => {
- const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkDriveFileSelectDialog.vue').then(x => x.default), {
+ return new Promise((resolve, rej) => {
+ let dispose: () => void;
+ os.popupAsyncWithDialog(import('@/components/MkDriveFileSelectDialog.vue').then(x => x.default), {
multiple: options.multiple ?? false,
}, {
done: files => {
@@ -190,7 +191,7 @@ export function chooseDriveFile(options: {
}
},
closed: () => dispose(),
- });
+ }).then((d) => dispose = d.dispose, rej);
});
}
@@ -301,14 +302,15 @@ export async function createCroppedImageDriveFileFromImageDriveFile(imageDriveFi
}
export async function selectDriveFolder(initialFolder: Misskey.entities.DriveFolder['id'] | null): Promise<(Misskey.entities.DriveFolder | null)[]> {
- return new Promise(async resolve => {
- const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkDriveFolderSelectDialog.vue').then(x => x.default), {
+ return new Promise((resolve, reject) => {
+ let dispose: () => void;
+ os.popupAsyncWithDialog(import('@/components/MkDriveFolderSelectDialog.vue').then(x => x.default), {
initialFolder,
}, {
done: folders => {
resolve(folders);
},
closed: () => dispose(),
- });
+ }).then(d => dispose = d.dispose, reject);
});
}