aboutsummaryrefslogtreecommitdiffstats
path: root/js/main.js
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-05-23 18:25:58 +0200
committerzottel <github@zottel.net>2012-05-23 18:25:58 +0200
commit3aa516ccabc9bb09ae30ffa2d3657fba36699ea9 (patch)
tree93cd7fe6c2b9b0cc5851cb8324b5f6591d990f7f /js/main.js
parente9c86c0fd0fb87b49e60669e6d4be810ca426ec4 (diff)
parent61dba985c14ebcfd20d18b579aee9b781f98bc23 (diff)
downloadvolse-hubzilla-3aa516ccabc9bb09ae30ffa2d3657fba36699ea9.tar.gz
volse-hubzilla-3aa516ccabc9bb09ae30ffa2d3657fba36699ea9.tar.bz2
volse-hubzilla-3aa516ccabc9bb09ae30ffa2d3657fba36699ea9.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);