From 22424e8abcd89f6f08a1f1104677fdc6f6cc9f15 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <georg@ownCloud.com>
Date: Sat, 2 Mar 2013 17:36:04 +0100
Subject: [PATCH] update OC.Notification.show
---
core/js/js.js | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/core/js/js.js b/core/js/js.js
index f3141fcd41..faae420ef7 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());
}
--
GitLab