diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-07-01 01:28:17 -0700 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-07-01 01:28:17 -0700 |
| commit | b19033b3533ce4726763aac6247aa156eb0a87d6 (patch) | |
| tree | a07308e75b5f00c952a622bcbfecd267b6837f43 /core/js | |
| parent | 80a8b9c99581d6e2e20276e4c0273e50b67e4658 (diff) | |
| parent | e0547a25ab9c5a3d9454611f72e00e3bc667e2d2 (diff) | |
| download | nextcloud-server-b19033b3533ce4726763aac6247aa156eb0a87d6.tar.gz nextcloud-server-b19033b3533ce4726763aac6247aa156eb0a87d6.zip | |
Merge pull request #3223 from owncloud/fix-2820
if rename of file fails, the rename is undone in the view - fix 2820
Diffstat (limited to 'core/js')
| -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 08b429a555b..3904787c4e5 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -352,10 +352,10 @@ OC.Notification={ }, show: function(text) { if(($('#notification').filter('span.undo').length == 1) || OC.Notification.isHidden()){ - $('#notification').html(text); + $('#notification').text(text); $('#notification').fadeIn().css("display","inline"); }else{ - OC.Notification.queuedNotifications.push($(text).html()); + OC.Notification.queuedNotifications.push($('<div/>').text(text).html()); } }, isHidden: function() { |