deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Улучшение синхронизации

Browse Source
This commit is contained in:
Book Pauk
2019-09-19 17:51:04 +07:00
parent 9612e7ebcd
commit 9e169e1f4b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/components/Reader/ServerStorage/ServerStorage.vue
View File

@@ -390,7 +390,7 @@ class ServerStorage extends Vue {
this.debouncedNotifySuccess(); this.debouncedNotifySuccess();
} }
async saveRecent(itemKey) { async saveRecent(itemKey, recurse) {
if (!this.keyInited || !this.serverSyncEnabled || this.savingRecent) if (!this.keyInited || !this.serverSyncEnabled || this.savingRecent)
return; return;
@@ -468,6 +468,11 @@ class ServerStorage extends Vue {
if (result.state == 'reject') { if (result.state == 'reject') {
await this.loadRecent(true, false); await this.loadRecent(true, false);
this.warning(`Последние изменения отменены. Данные синхронизированы с сервером.`); this.warning(`Последние изменения отменены. Данные синхронизированы с сервером.`);
if (!recurse) {
this.savingRecent = false;
this.saveRecent(itemKey, true);
return;
}
} else if (result.state == 'success') { } else if (result.state == 'success') {
this.oldRecent = _.cloneDeep(bm.recent); this.oldRecent = _.cloneDeep(bm.recent);
this.recentDiff = null; this.recentDiff = null;