Resolve conflicts

This commit is contained in:
syuilo 2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions

View file

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