aboutsummaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2011-09-08 20:12:17 +0200
committerfabrixxm <fabrix.xm@gmail.com>2011-09-08 20:12:17 +0200
commit2fabf8d2188516a36589487bfa2ca01dea0c5ca2 (patch)
tree763475aeb95934ec54b3ba2af8d4604dba086ad1 /js
parent2f5a34ad1791f01cacb3b86c11501f0e11c67df4 (diff)
parentdbc5ecfe572b0dc11bab277dcbe24541cdd4e858 (diff)
downloadvolse-hubzilla-2fabf8d2188516a36589487bfa2ca01dea0c5ca2.tar.gz
volse-hubzilla-2fabf8d2188516a36589487bfa2ca01dea0c5ca2.tar.bz2
volse-hubzilla-2fabf8d2188516a36589487bfa2ca01dea0c5ca2.zip
Merge branch 'newui' of github.com:fabrixxm/friendika into newui
Diffstat (limited to 'js')
-rw-r--r--js/main.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/js/main.js b/js/main.js
index 328b1f231..452cb8451 100644
--- a/js/main.js
+++ b/js/main.js
@@ -97,9 +97,10 @@
var eNotif = $(data).find('notif')
notif = eNotif.attr('count');
if (notif>0){
+ $("#nav-notifications-linkmenu").addClass("on");
nnm = $("#nav-notifications-menu");
nnm.html("");
- nnm.attr('popup','true');
+ //nnm.attr('popup','true');
eNotif.children("note").each(function(){
e = $(this);
text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
@@ -107,6 +108,7 @@
nnm.append(html);
});
} else {
+ $("#nav-notifications-linkmenu").removeClass("on");
$("#nav-notifications-menu").html(notifications_empty);
}
if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }