IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Composer doesn't show an error message in case of a network issue and stops updating draft after (#13268)

Browse Source
This commit is contained in:
Andrei Prigorshnev 2021-06-04 16:15:47 +04:00 committed by GitHub
parent da2889a7a8
commit 476dfaed2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/app/lib/ajax.js
View File

@ -70,6 +70,12 @@ export function ajax() {
args = arguments[1]; args = arguments[1];
} }
let ignoreUnsent = true;
if (args.ignoreUnsent !== undefined) {
ignoreUnsent = args.ignoreUnsent;
delete args.ignoreUnsent;
}
function performAjax(resolve, reject) { function performAjax(resolve, reject) {
args.headers = args.headers || {}; args.headers = args.headers || {};
@ -112,7 +118,7 @@ export function ajax() {
args.error = (xhr, textStatus, errorThrown) => { args.error = (xhr, textStatus, errorThrown) => {
// 0 represents the `UNSENT` state // 0 represents the `UNSENT` state
if (xhr.readyState === 0) { if (ignoreUnsent && xhr.readyState === 0) {
// Make sure we log pretender errors in test mode // Make sure we log pretender errors in test mode
if (textStatus === "error" && isTesting()) { if (textStatus === "error" && isTesting()) {
throw errorThrown; throw errorThrown;

1
app/assets/javascripts/discourse/app/models/draft.js
View File

@ -34,6 +34,7 @@ Draft.reopenClass({
owner: clientId, owner: clientId,
force_save: forceSave, force_save: forceSave,
}, },
ignoreUnsent: false,
}); });
}, },
}); });