diff --git a/dev/Common/Folders.js b/dev/Common/Folders.js index 45d037a6b..b75bf7cfc 100644 --- a/dev/Common/Folders.js +++ b/dev/Common/Folders.js @@ -249,7 +249,7 @@ messagesMoveHelper = (fromFolderFullName, toFolderFullName, uidsForMove) => { isSpam = sSpamFolder === toFolderFullName, isHam = !isSpam && sSpamFolder === fromFolderFullName && getFolderInboxName() === toFolderFullName; - Remote.request('MessageMove', + Remote.abort('MessageList').request('MessageMove', moveOrDeleteResponseHelper, { FromFolder: fromFolderFullName, @@ -257,23 +257,17 @@ messagesMoveHelper = (fromFolderFullName, toFolderFullName, uidsForMove) => { Uids: uidsForMove.join(','), MarkAsRead: (isSpam || FolderUserStore.trashFolder() === toFolderFullName) ? 1 : 0, Learning: isSpam ? 'SPAM' : isHam ? 'HAM' : '' - }, - null, - '', - ['MessageList'] + } ); }, messagesDeleteHelper = (sFromFolderFullName, aUidForRemove) => { - Remote.request('MessageDelete', + Remote.abort('MessageList').request('MessageDelete', moveOrDeleteResponseHelper, { Folder: sFromFolderFullName, Uids: aUidForRemove.join(',') - }, - null, - '', - ['MessageList'] + } ); }, diff --git a/dev/Remote/AbstractFetch.js b/dev/Remote/AbstractFetch.js index 72c0fdc09..544a7ea04 100644 --- a/dev/Remote/AbstractFetch.js +++ b/dev/Remote/AbstractFetch.js @@ -123,16 +123,13 @@ export class AbstractFetchRemote * @param {Object=} oParameters * @param {?number=} iTimeout * @param {string=} sGetAdd = '' - * @param {Array=} aAbortActions = [] */ request(sAction, fCallback, params, iTimeout, sGetAdd, abortActions) { params = params || {}; const start = Date.now(); - if (sAction && abortActions) { - abortActions.forEach(actionToAbort => abort(actionToAbort)); - } + abortActions && console.error('abortActions is obsolete'); fetchJSON(sAction, pString(sGetAdd), params, diff --git a/dev/Remote/User/Fetch.js b/dev/Remote/User/Fetch.js index 7122b677f..b8d00ad62 100644 --- a/dev/Remote/User/Fetch.js +++ b/dev/Remote/User/Fetch.js @@ -51,12 +51,12 @@ class RemoteUserFetch extends AbstractFetchRemote { params = {}; } + bSilent || this.abort('MessageList'); this.request('MessageList', fCallback, params, 60000, // 60 seconds before aborting - sGetAdd, - bSilent ? [] : ['MessageList'] + sGetAdd ); } @@ -71,7 +71,7 @@ class RemoteUserFetch extends AbstractFetchRemote { iUid = pInt(iUid); if (getFolderFromCacheList(sFolderFullName) && 0 < iUid) { - this.request('Message', + this.abort('Message').request('Message', fCallback, {}, null, @@ -83,8 +83,7 @@ class RemoteUserFetch extends AbstractFetchRemote { iUid, AppUserStore.threadsAllowed() && SettingsUserStore.useThreads() ? 1 : 0, SettingsGet('AccountHash') - ]), - ['Message'] + ]) ); return true; diff --git a/dev/Settings/Admin/Packages.js b/dev/Settings/Admin/Packages.js index 7e33241db..d204859f1 100644 --- a/dev/Settings/Admin/Packages.js +++ b/dev/Settings/Admin/Packages.js @@ -59,7 +59,7 @@ export class AdminSettingsPackages extends AbstractViewSettings { requestHelper(packageToRequest, install) { return (iError, data) => { PackageAdminStore.forEach(item => { - if (packageToRequest && item?.loading() && packageToRequest.file === item.file) { + if (packageToRequest && item?.loading?.() && packageToRequest.file === item.file) { packageToRequest.loading(false); item.loading(false); } @@ -109,7 +109,7 @@ export class AdminSettingsPackages extends AbstractViewSettings { let disable = plugin.enabled(); plugin.enabled(!disable); Remote.request('AdminPluginDisable', - (iError, data) => { + (iError, data) => { if (iError) { plugin.enabled(disable); this.packagesError( diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js index e192d7e2a..065792db1 100644 --- a/dev/View/Popup/Compose.js +++ b/dev/View/Popup/Compose.js @@ -758,7 +758,7 @@ export class ComposePopupView extends AbstractViewPopup { // getAutocomplete emailsSource(value, fResponse) { - Remote.request('Suggestions', + Remote.abort('Suggestions').request('Suggestions', (iError, data) => { if (!iError && isArray(data.Result)) { fResponse( @@ -772,10 +772,7 @@ export class ComposePopupView extends AbstractViewPopup { { Query: value // ,Page: 1 - }, - null, - '', - ['Suggestions'] + } ); } diff --git a/dev/View/Popup/Contacts.js b/dev/View/Popup/Contacts.js index 16a76e988..443935390 100644 --- a/dev/View/Popup/Contacts.js +++ b/dev/View/Popup/Contacts.js @@ -403,7 +403,7 @@ export class ContactsPopupView extends AbstractViewPopup { } ContactUserStore.loading(true); - Remote.request('Contacts', + Remote.abort('Contacts').request('Contacts', (iError, data) => { let count = 0, list = []; @@ -429,10 +429,7 @@ export class ContactsPopupView extends AbstractViewPopup { Offset: offset, Limit: CONTACTS_PER_PAGE, Search: this.search() - }, - null, - '', - ['Contacts'] + } ); }