diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-07-20 14:31:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-20 14:31:41 +0200 |
| commit | b37e1ed17f54916e3321427d92afa3f74ebea1b3 (patch) | |
| tree | 913af57fe45245632aef5e71cde26b585168ba3d /core | |
| parent | f414c664f281ad14ed2b0e976ea73238d895457d (diff) | |
| parent | 45c99c226bd221bdf21a8579834524204b034706 (diff) | |
| download | nextcloud-server-b37e1ed17f54916e3321427d92afa3f74ebea1b3.tar.gz nextcloud-server-b37e1ed17f54916e3321427d92afa3f74ebea1b3.zip | |
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…
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/js.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/js/js.js b/core/js/js.js index 07ed396bec9..d2bbbae6362 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1127,7 +1127,7 @@ OC.Notification={ * * @param {string} text Message to display * @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) * @return {jQuery} jQuery element for notification row */ @@ -1143,7 +1143,7 @@ OC.Notification={ * @param {array} [options] options array * @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 {string] [options.type] notification type + * @param {string} [options.type] notification type */ showTemporary: function(text, options) { var self = this; |