diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-05-03 00:15:28 +0200 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-06-15 09:58:27 +0200 |
| commit | e0547a25ab9c5a3d9454611f72e00e3bc667e2d2 (patch) | |
| tree | 7b8c8e9f556937f26fb8d478e29d095d4c25f83d /core/js | |
| parent | ab411d2700c01886a67b30bce5f630cc6865a9bf (diff) | |
| download | nextcloud-server-e0547a25ab9c5a3d9454611f72e00e3bc667e2d2.tar.gz nextcloud-server-e0547a25ab9c5a3d9454611f72e00e3bc667e2d2.zip | |
if rename of file fails, the rename is undone in the view - #fix 2820
Changes:
* OC.dialog -> OC.Notification
* Added test
* Fixed OC.Notification.show() issue for queued items
* Highlight failed item and show notification
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 3cb4d3dd151..55db625a339 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -349,10 +349,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() { |