diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-03-29 14:48:47 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-03-29 14:48:47 +0900 |
| commit | bfc193d8cd9aecdb82d585e8b4e101deac60a5bb (patch) | |
| tree | 8b4dac3a56cf703650c8207f9279028a8560a96b /src/server/web/app/desktop/views/components/drive.nav-folder.vue | |
| parent | resolve conflict (diff) | |
| download | misskey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.gz misskey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.bz2 misskey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.zip | |
Resolve conflicts
Diffstat (limited to 'src/server/web/app/desktop/views/components/drive.nav-folder.vue')
| -rw-r--r-- | src/server/web/app/desktop/views/components/drive.nav-folder.vue | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/web/app/desktop/views/components/drive.nav-folder.vue b/src/server/web/app/desktop/views/components/drive.nav-folder.vue index dfbf116bff..d885a72f7f 100644 --- a/src/server/web/app/desktop/views/components/drive.nav-folder.vue +++ b/src/server/web/app/desktop/views/components/drive.nav-folder.vue @@ -78,8 +78,8 @@ export default Vue.extend({ const file = JSON.parse(driveFile); this.browser.removeFile(file.id); (this as any).api('drive/files/update', { - file_id: file.id, - folder_id: this.folder ? this.folder.id : null + fileId: file.id, + folderId: this.folder ? this.folder.id : null }); } //#endregion @@ -92,8 +92,8 @@ export default Vue.extend({ if (this.folder && folder.id == this.folder.id) return; this.browser.removeFolder(folder.id); (this as any).api('drive/folders/update', { - folder_id: folder.id, - parent_id: this.folder ? this.folder.id : null + folderId: folder.id, + parentId: this.folder ? this.folder.id : null }); } //#endregion |