Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Calviño Sánchez <danxuliu@gmail.com>2022-06-14 17:07:35 +0300
committerDaniel Calviño Sánchez <danxuliu@gmail.com>2022-06-14 17:07:35 +0300
commite15b43d976691b4d0f9901650178779bdd9a5d6c (patch)
treee06b62ab351db310d6cb1e55257be1e33c2741f3
parent752277925159685fe2430011e4b74546f1aa296c (diff)
Fix default toast message for failed uploads with HTTP/2fix-default-toast-message-for-failed-uploads-with-http2
When an upload fails a toast is shown with either a specific message or just the textual part of the HTTP error code (which comes from the upload failure handler and set by "jQuery.ajax()". However, if there is neither a message nor an error then the toast will show the default message from the Toastify-js library, which is an undescriptive "Hi there!". When HTTP/2 is used Chromium does not provide the textual part of the HTTP error code, so when an upload fails the toast can receive an empty message and thus just show "Hi there!". Now an explicit message is provided as a fallback to prevent that. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
-rw-r--r--apps/files/js/file-upload.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 793c9672c3f..648a5a0307b 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -1134,7 +1134,7 @@ OC.Uploader.prototype = _.extend({
}
}
console.error(e, data, response)
- OC.Notification.show(message || data.errorThrown, {type: 'error'});
+ OC.Notification.show(message || data.errorThrown || t('files', 'File could not be uploaded'), {type: 'error'});
}
if (upload) {