diff options
| author | Friendika <info@friendika.com> | 2011-10-03 05:17:00 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-10-03 05:17:00 -0700 |
| commit | e4b4c1e9f8cc00c7cf6dfbffe3c1400cc1e3340f (patch) | |
| tree | b7f6c22d7924990cb698acc24273e2283d154eab /js | |
| parent | 8edab8067390a5f565f6abb889ec8dd1b18583d4 (diff) | |
| parent | 209958a58434ba7740f762ed2026e04254edbf9c (diff) | |
| download | volse-hubzilla-e4b4c1e9f8cc00c7cf6dfbffe3c1400cc1e3340f.tar.gz volse-hubzilla-e4b4c1e9f8cc00c7cf6dfbffe3c1400cc1e3340f.tar.bz2 volse-hubzilla-e4b4c1e9f8cc00c7cf6dfbffe3c1400cc1e3340f.zip | |
Merge pull request #15 from fabrixxm/master
some work on quattro theme and a little fix to JS
Diffstat (limited to 'js')
| -rw-r--r-- | js/main.js | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/js/main.js b/js/main.js index e0694e47f..430f216d1 100644 --- a/js/main.js +++ b/js/main.js @@ -164,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(); } @@ -182,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); } |