mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #460 from nextcloud/issue-459-html-decoded-error-message-when-uploading-folder 

Fix the HTML encoding when uploading a folder in FF when using french…
This commit is contained in:
Lukas Reschke 2016-07-20 14:31:41 +02:00 committed by GitHub
parent f414c664f2 45c99c226b
commit b37e1ed17f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files/js/file-upload.js
View File

@ -474,9 +474,9 @@ OC.Upload = {
} else { } else {
// HTTP connection problem // HTTP connection problem
var message = t('files', 'Error uploading file "{fileName}": {message}', { var message = t('files', 'Error uploading file "{fileName}": {message}', {
fileName: data.files[0].name, fileName: escapeHTML(data.files[0].name),
message: data.errorThrown message: data.errorThrown
}); }, undefined, {escape: false});
OC.Notification.show(message, {timeout: 0, type: 'error'}); OC.Notification.show(message, {timeout: 0, type: 'error'});
if (data.result) { if (data.result) {
var result = JSON.parse(data.result); var result = JSON.parse(data.result);

4
core/js/js.js
View File

@ -1127,7 +1127,7 @@ OC.Notification={
* *
* @param {string} text Message to display * @param {string} text Message to display
* @param {Object} [options] options * @param {Object} [options] options
* @param {string] [options.type] notification type * @param {string} [options.type] notification type
* @param {int} [options.timeout=0] timeout value, defaults to 0 (permanent) * @param {int} [options.timeout=0] timeout value, defaults to 0 (permanent)
* @return {jQuery} jQuery element for notification row * @return {jQuery} jQuery element for notification row
*/ */
@ -1143,7 +1143,7 @@ OC.Notification={
* @param {array} [options] options array * @param {array} [options] options array
* @param {int} [options.timeout=7] timeout in seconds, if this is 0 it will show the message permanently * @param {int} [options.timeout=7] timeout in seconds, if this is 0 it will show the message permanently
* @param {boolean} [options.isHTML=false] an indicator for HTML notifications (true) or text (false) * @param {boolean} [options.isHTML=false] an indicator for HTML notifications (true) or text (false)
* @param {string] [options.type] notification type * @param {string} [options.type] notification type
*/ */
showTemporary: function(text, options) { showTemporary: function(text, options) {
var self = this; var self = this;