From e02bdc14fdf9b811a241dbaec8605cc70cb2961c Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 14 Oct 2022 23:14:22 +0900
Subject: [PATCH] Fix missing `isCancel` (#19354)
---
app/javascript/mastodon/actions/compose.js | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index da11a9d5a3..0cfc1868ee 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -1,4 +1,4 @@
-import { isCancel } from 'axios';
+import axios from 'axios';
import { throttle } from 'lodash';
import { defineMessages } from 'react-intl';
import api from 'mastodon/api';
@@ -462,9 +462,11 @@ const fetchComposeSuggestionsAccounts = throttle((dispatch, getState, token) =>
dispatch(importFetchedAccounts(response.data));
dispatch(readyComposeSuggestionsAccounts(token, response.data));
}).catch(error => {
- if (!isCancel(error)) {
+ if (!axios.isCancel(error)) {
dispatch(showAlertForError(error));
}
+ }).finally(() => {
+ fetchComposeSuggestionsAccountsController = undefined;
});
}, 200, { leading: true, trailing: true });
@@ -495,9 +497,11 @@ const fetchComposeSuggestionsTags = throttle((dispatch, getState, token) => {
}).then(({ data }) => {
dispatch(readyComposeSuggestionsTags(token, data.hashtags));
}).catch(error => {
- if (!isCancel(error)) {
+ if (!axios.isCancel(error)) {
dispatch(showAlertForError(error));
}
+ }).finally(() => {
+ fetchComposeSuggestionsTagsController = undefined;
});
}, 200, { leading: true, trailing: true });
--
GitLab