diff options
author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-10-05 20:59:21 +0200 |
---|---|---|
committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-10-05 20:59:21 +0200 |
commit | 90870d4872dbc8ff408183a79fd005b905aa86c2 (patch) | |
tree | cdd66eea79a7638b520576d381d08368b05a19c1 /js/main.js | |
parent | e88a8564c849b199ca552fa307f385b422d5d00a (diff) | |
parent | 5cb0b0ed4591a578720e0c985974db2d95f3810a (diff) | |
download | volse-hubzilla-90870d4872dbc8ff408183a79fd005b905aa86c2.tar.gz volse-hubzilla-90870d4872dbc8ff408183a79fd005b905aa86c2.tar.bz2 volse-hubzilla-90870d4872dbc8ff408183a79fd005b905aa86c2.zip |
Merge branch 'master' of git://github.com/friendika/Free-Friendika
Diffstat (limited to 'js/main.js')
-rw-r--r-- | js/main.js | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/js/main.js b/js/main.js index 896cbeb56..430f216d1 100644 --- a/js/main.js +++ b/js/main.js @@ -95,6 +95,16 @@ if(home == 0) { home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') } $('#home-update').html(home); + var intro = $(data).find('intro').text(); + if(intro == 0) { intro = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') } + $('#intro-update').html(intro); + + var mail = $(data).find('mail').text(); + if(mail == 0) { mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') } + $('#mail-update').html(mail); + + + var eNotif = $(data).find('notif') notif = eNotif.attr('count'); if (notif>0){ @@ -154,6 +164,15 @@ }); function NavUpdate() { + if(! stopped) { + $.get("ping",function(data) { + $(data).find('result').each(function() { + // send nav-update event + $('nav').trigger('nav-update', this); + }); + }) ; + } + if($('#live-network').length) { src = 'network'; liveUpdate(); } if($('#live-profile').length) { src = 'profile'; liveUpdate(); } @@ -172,14 +191,6 @@ } } - if(! stopped) { - $.get("ping",function(data) { - $(data).find('result').each(function() { - // send nav-update event - $('nav').trigger('nav-update', this); - }); - }) ; - } timer = setTimeout(NavUpdate,30000); } |