diff options
| author | Georg Ehrke <georg@ownCloud.com> | 2013-03-02 17:36:04 +0100 |
|---|---|---|
| committer | Georg Ehrke <georg@ownCloud.com> | 2013-03-02 17:36:04 +0100 |
| commit | 22424e8abcd89f6f08a1f1104677fdc6f6cc9f15 (patch) | |
| tree | fd52e6d89a5cfda0b1696005304d2b736a17cfe6 /core | |
| parent | ff9476b3e3f857369521a0cab39d76b821b8b7fc (diff) | |
| download | nextcloud-server-22424e8abcd89f6f08a1f1104677fdc6f6cc9f15.tar.gz nextcloud-server-22424e8abcd89f6f08a1f1104677fdc6f6cc9f15.zip | |
update OC.Notification.show
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/js.js | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/core/js/js.js b/core/js/js.js index f3141fcd41a..faae420ef7f 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -348,15 +348,9 @@ OC.Notification={ } }, show: function(text) { - if(text == ''){ - return false; - } - if(OC.Notification.currentlyShownNotifications < 2){ - var notification = $('#notification'); - notification.hide(); - notification.text(text); - notification.fadeIn().css("display","inline"); - OC.Notification.currentlyShownNotifications++; + if(($('#notification').filter('span.undo').length == 1) || OC.Notification.isHidden()){ + $('#notification').html(html); + $('#notification').fadeIn().css("display","inline"); }else{ OC.Notification.queuedNotifications.push($(text).html()); } |