diff options
| author | zottel <github@zottel.net> | 2012-04-15 14:11:11 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-15 14:11:11 +0200 |
| commit | a2c4ce74871dbe9e640cdeafc1574bda5b7fe144 (patch) | |
| tree | fce1c1b2d497adae72d77e09c6bf005c8900256b /js | |
| parent | 0bad8de0562a50fa93b0af5fd4cf8d7123a11b46 (diff) | |
| parent | f299749758112361ee6384cd75d11b2c3a57352a (diff) | |
| download | volse-hubzilla-a2c4ce74871dbe9e640cdeafc1574bda5b7fe144.tar.gz volse-hubzilla-a2c4ce74871dbe9e640cdeafc1574bda5b7fe144.tar.bz2 volse-hubzilla-a2c4ce74871dbe9e640cdeafc1574bda5b7fe144.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'js')
| -rw-r--r--[-rwxr-xr-x] | js/main.js | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/js/main.js b/js/main.js index 7f0428b5b..7a90fa910 100755..100644 --- a/js/main.js +++ b/js/main.js @@ -137,13 +137,12 @@ $('#mail-update-li').html(mail); var eNotif = $(data).find('notif') - notif = eNotif.attr('count'); - if (notif>=0){ - $("#nav-notifications-linkmenu").addClass("on"); + + if (eNotif.children("note").length==0){ + $("#nav-notifications-menu").html(notifications_empty); + } else { nnm = $("#nav-notifications-menu"); - nnm.html(notifications_all + notifications_mark); - //nnm.attr('popup','true'); eNotif.children("note").each(function(){ e = $(this); @@ -151,10 +150,12 @@ html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen')); nnm.append(html); }); - + } + notif = eNotif.attr('count'); + if (notif>0){ + $("#nav-notifications-linkmenu").addClass("on"); } else { - // $("#nav-notifications-linkmenu").removeClass("on"); - // $("#nav-notifications-menu").html(notifications_empty); + $("#nav-notifications-linkmenu").removeClass("on"); } if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') } $('#notify-update').html(notif); @@ -609,4 +610,4 @@ function previewTheme(elm) { $('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>'); }); -}
\ No newline at end of file +} |