aboutsummaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-04-12 05:48:41 -0700
committerfriendica <info@friendica.com>2012-04-12 05:48:41 -0700
commit03563ca35a0c40224e3159c664c596691078df90 (patch)
treef87a3f8d7e4dee761e4dc8699eba954760d69173 /js
parent6fa8b3067fad3a974b5e08e78739f83681f9bb6f (diff)
parent23b08e3ea79936ecee0a061e38a08145f3fca1da (diff)
downloadvolse-hubzilla-03563ca35a0c40224e3159c664c596691078df90.tar.gz
volse-hubzilla-03563ca35a0c40224e3159c664c596691078df90.tar.bz2
volse-hubzilla-03563ca35a0c40224e3159c664c596691078df90.zip
Merge https://github.com/friendica/friendica into pull
Diffstat (limited to 'js')
-rwxr-xr-xjs/main.js19
1 files changed, 10 insertions, 9 deletions
diff --git a/js/main.js b/js/main.js
index 7f0428b5b..7a90fa910 100755
--- 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
+}