aboutsummaryrefslogtreecommitdiffstats
path: root/js/main.js
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-05-25 16:19:10 +0200
committerMichael Vogel <icarus@dabo.de>2012-05-25 16:19:10 +0200
commita71e3134bf7250b60cafd1e51098eea70c3459de (patch)
tree456f59d30e5f4b8d22f4bfdac0c55e7323cd0427 /js/main.js
parent8c80fe0bf51fa472ddf9bf225490e47ea1bf4a7f (diff)
parentd1345e505406b1a1cdc3fc26a1734916c8abc89d (diff)
downloadvolse-hubzilla-a71e3134bf7250b60cafd1e51098eea70c3459de.tar.gz
volse-hubzilla-a71e3134bf7250b60cafd1e51098eea70c3459de.tar.bz2
volse-hubzilla-a71e3134bf7250b60cafd1e51098eea70c3459de.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);