aboutsummaryrefslogtreecommitdiffstats
path: root/js/main.js
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-05-26 11:59:19 +0200
committerMichael <icarus@dabo.de>2012-05-26 11:59:19 +0200
commit7b3c02057db47a627b56bdd79f1055ea7f876617 (patch)
tree8c9b11fa72e544aea721f385b40bff7254e42ed2 /js/main.js
parent6342b3e0bdd5774857a8fca809994f05e0208d25 (diff)
parentf5290a5a107ef2d6c309c4a3205319c9b0d13994 (diff)
downloadvolse-hubzilla-7b3c02057db47a627b56bdd79f1055ea7f876617.tar.gz
volse-hubzilla-7b3c02057db47a627b56bdd79f1055ea7f876617.tar.bz2
volse-hubzilla-7b3c02057db47a627b56bdd79f1055ea7f876617.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'js/main.js')
-rw-r--r--js/main.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/js/main.js b/js/main.js
index 6a2632441..885e042aa 100644
--- a/js/main.js
+++ b/js/main.js
@@ -117,6 +117,9 @@
/* nav update event */
$('nav').bind('nav-update', function(e,data){;
+ var invalid = $(data).find('invalid').text();
+ if(invalid == 1) { window.location.href=window.location.href }
+
var net = $(data).find('net').text();
if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') }
$('#net-update').html(net);
@@ -211,7 +214,8 @@
function NavUpdate() {
if(! stopped) {
- $.get("ping",function(data) {
+ var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : '');
+ $.get(pingCmd,function(data) {
$(data).find('result').each(function() {
// send nav-update event
$('nav').trigger('nav-update', this);