paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-14 10:57:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

upload: Don't hide upload status if there are errors.

Browse Source
This commit is contained in:
Vishnu KS
2020-04-16 21:52:43 +05:30
committed by Tim Abbott
parent c06d29d0aa
commit c5eddcb1ca
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
frontend_tests/node_tests/upload.js
View File

@@ -486,6 +486,7 @@ run_test('uppy_events', () => {
upload.hide_upload_status = () => { upload.hide_upload_status = () => {
hide_upload_status_called = true; hide_upload_status_called = true;
}; };
$("#compose-send-status").removeClass("alert-error");
files = [ files = [
{ {
id: "uppy-zulip/jpeg-1e-image/jpeg-163515-1578367331279", id: "uppy-zulip/jpeg-1e-image/jpeg-163515-1578367331279",
@@ -504,6 +505,12 @@ run_test('uppy_events', () => {
assert(hide_upload_status_called); assert(hide_upload_status_called);
assert.equal(files.length, 0); assert.equal(files.length, 0);
hide_upload_status_called = false;
$("#compose-send-status").addClass("alert-error");
on_complete_callback();
assert(!hide_upload_status_called);
$("#compose-send-status").removeClass("alert-error");
hide_upload_status_called = false; hide_upload_status_called = false;
files = [ files = [
{ {

3
static/js/upload.js
View File

@@ -225,7 +225,8 @@ exports.setup_upload = function (config) {
} }
}); });
if (!uploads_in_progress) { const has_errors = exports.get_item("send_status", config).hasClass("alert-error");
if (!uploads_in_progress && !has_errors) {
setTimeout(function () { setTimeout(function () {
exports.hide_upload_status(config); exports.hide_upload_status(config);
}, 500); }, 500);