diff options
| author | Michael <icarus@dabo.de> | 2012-02-26 21:47:47 +0100 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-02-26 21:47:47 +0100 |
| commit | 437e18d7a7433ea5a9e3388c39ba32c7fe25eb18 (patch) | |
| tree | 747449ae089f3dd3f6bb55afdf93fa79081bd564 /js | |
| parent | edc44933a4f57c09ee1cfb93615d052a2b125d99 (diff) | |
| parent | 2081e6d507d5983f802c1024cf1e38c6d06d6067 (diff) | |
| download | volse-hubzilla-437e18d7a7433ea5a9e3388c39ba32c7fe25eb18.tar.gz volse-hubzilla-437e18d7a7433ea5a9e3388c39ba32c7fe25eb18.tar.bz2 volse-hubzilla-437e18d7a7433ea5a9e3388c39ba32c7fe25eb18.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'js')
| -rwxr-xr-x | js/main.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/main.js b/js/main.js index 3a10ae468..a5d1214cb 100755 --- a/js/main.js +++ b/js/main.js @@ -114,7 +114,7 @@ var eNotif = $(data).find('notif') notif = eNotif.attr('count'); - if (notif>0){ + if (notif>=0){ $("#nav-notifications-linkmenu").addClass("on"); nnm = $("#nav-notifications-menu"); @@ -124,13 +124,13 @@ eNotif.children("note").each(function(){ e = $(this); text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>"); - html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date')); + html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen')); nnm.append(html); }); } else { - $("#nav-notifications-linkmenu").removeClass("on"); - $("#nav-notifications-menu").html(notifications_empty); + // $("#nav-notifications-linkmenu").removeClass("on"); + // $("#nav-notifications-menu").html(notifications_empty); } if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') } $('#notify-update').html(notif); |