From e1be68ec3dc5815bc435a7e078ab02a1ebdb63a8 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Fri, 20 Sep 2019 20:20:11 +0700 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B1=D0=B0=D0=B3=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/ServerStorage/ServerStorage.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/components/Reader/ServerStorage/ServerStorage.vue b/client/components/Reader/ServerStorage/ServerStorage.vue index 297380cb..0275c4f1 100644 --- a/client/components/Reader/ServerStorage/ServerStorage.vue +++ b/client/components/Reader/ServerStorage/ServerStorage.vue @@ -71,7 +71,10 @@ class ServerStorage extends Vue { } async bookManagerEvent(eventName, itemKey) { - if (eventName == 'recent-changed') { + if (!this.serverSyncEnabled) + return; + + if (eventName == 'recent-changed') { if (itemKey) { if (!this.recentDeltaInited) { this.warning('Функции сохранения на сервер пока недоступны'); From 7863b3358e9e66bd3a3049ec069b27bffa25dbdb Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Fri, 20 Sep 2019 20:34:42 +0700 Subject: [PATCH 2/4] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20appcache?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/webpack.prod.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/webpack.prod.config.js b/build/webpack.prod.config.js index 87b93937..cc7f338f 100644 --- a/build/webpack.prod.config.js +++ b/build/webpack.prod.config.js @@ -55,6 +55,6 @@ module.exports = merge(baseWpConfig, { filename: `${publicDir}/index.html` }), new CopyWebpackPlugin([{from: `${clientDir}/assets/*`, to: `${publicDir}/`, flatten: true}]), - new AppCachePlugin({}) + //new AppCachePlugin({}) ] }); From 9b6ecd4e6b488e1f9f11883e408a63f4af7b1f88 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Fri, 20 Sep 2019 20:35:12 +0700 Subject: [PATCH 3/4] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B2?= =?UTF-8?q?=D1=8B=D1=87=D0=B8=D1=81=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B4?= =?UTF-8?q?=D0=B8=D1=84=D1=84=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/ServerStorage/ServerStorage.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/components/Reader/ServerStorage/ServerStorage.vue b/client/components/Reader/ServerStorage/ServerStorage.vue index 0275c4f1..92f5a43c 100644 --- a/client/components/Reader/ServerStorage/ServerStorage.vue +++ b/client/components/Reader/ServerStorage/ServerStorage.vue @@ -73,7 +73,7 @@ class ServerStorage extends Vue { async bookManagerEvent(eventName, itemKey) { if (!this.serverSyncEnabled) return; - + if (eventName == 'recent-changed') { if (itemKey) { if (!this.recentDeltaInited) { @@ -458,7 +458,7 @@ class ServerStorage extends Vue { this.prevItemKey = itemKey; //дифф от дельты для уменьшения размера передаваемых данных в частном случае - if (this.makeDeltaDiff) { + /*if (this.makeDeltaDiff) { this.recentDelta.diff = utils.getObjDiff(this.prevSavedItem, bm.recent[itemKey]); this.recentDelta.diff.key = itemKey; delete this.recentDelta[itemKey]; @@ -470,7 +470,7 @@ class ServerStorage extends Vue { this.recentDelta[key] = utils.applyObjDiff(this.prevSavedItem, this.recentDelta.diff); } delete this.recentDelta.diff; - } + }*/ //сохранение this.savingRecent = true; From 741317aaaf3ced53c9175b75efc71d517f77a64c Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Fri, 20 Sep 2019 20:36:31 +0700 Subject: [PATCH 4/4] =?UTF-8?q?=D0=9A=20=D0=BF=D1=80=D0=B5=D0=B4=D1=8B?= =?UTF-8?q?=D0=B4=D1=83=D1=89=D0=B5=D0=BC=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/ServerStorage/ServerStorage.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/client/components/Reader/ServerStorage/ServerStorage.vue b/client/components/Reader/ServerStorage/ServerStorage.vue index 92f5a43c..34d0d052 100644 --- a/client/components/Reader/ServerStorage/ServerStorage.vue +++ b/client/components/Reader/ServerStorage/ServerStorage.vue @@ -471,6 +471,7 @@ class ServerStorage extends Vue { } delete this.recentDelta.diff; }*/ +delete this.recentDelta.diff; //сохранение this.savingRecent = true;