aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShpuld Shpuldson <shp@cock.li>2020-09-04 11:22:14 +0300
committerShpuld Shpuldson <shp@cock.li>2020-09-04 11:22:14 +0300
commitc89ac79140e059f89d4da88ce49c9bb24db4cc20 (patch)
treed1110311b3c3cf652fe69122e993ff711f993b2e
parent3fb35e8123d3a8cd151571b315b7ec4d7e0875c7 (diff)
fix chat fetcher stops, change fetcher code
-rw-r--r--src/modules/chats.js4
-rw-r--r--src/services/promise_interval/promise_interval.js3
2 files changed, 3 insertions, 4 deletions
diff --git a/src/modules/chats.js b/src/modules/chats.js
index 60273a44..8e2fabb6 100644
--- a/src/modules/chats.js
+++ b/src/modules/chats.js
@@ -112,14 +112,14 @@ const chats = {
setChatListFetcher (state, { commit, fetcher }) {
const prevFetcher = state.chatListFetcher
if (prevFetcher) {
- prevFetcher()
+ prevFetcher.stop()
}
state.chatListFetcher = fetcher && fetcher()
},
setCurrentChatFetcher (state, { fetcher }) {
const prevFetcher = state.fetcher
if (prevFetcher) {
- prevFetcher()
+ prevFetcher.stop()
}
state.fetcher = fetcher && fetcher()
},
diff --git a/src/services/promise_interval/promise_interval.js b/src/services/promise_interval/promise_interval.js
index ee46a236..cf17970d 100644
--- a/src/services/promise_interval/promise_interval.js
+++ b/src/services/promise_interval/promise_interval.js
@@ -8,9 +8,8 @@
export const promiseInterval = (promiseCall, interval) => {
let stopped = false
let timeout = null
- let func = () => {}
- func = () => {
+ const func = () => {
promiseCall().finally(() => {
if (stopped) return
timeout = window.setTimeout(func, interval)