diff --git a/js/main.js b/js/main.js index 902c19a839..03356e1ba3 100644 --- a/js/main.js +++ b/js/main.js @@ -21,6 +21,7 @@ var src = null; var prev = null; var livetime = null; + var force_update = false; var msie = false; var stopped = false; var totStopped = false; @@ -301,11 +302,16 @@ prev = 'live-' + src; in_progress = true; + + if ($(document).scrollTop() == 0) + force_update = true; + var udargs = ((netargs.length) ? '/' + netargs : ''); - var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0) + '&top=' + ($(document).scrollTop() != 0 ? '0' : '1'); + var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0) + '&force=' + (force_update ? '1' : '0'); $.get(update_url,function(data) { in_progress = false; + force_update = false; // $('.collapsed-comments',data).each(function() { // var ident = $(this).attr('id'); // var is_hidden = $('#' + ident).is(':hidden'); @@ -414,6 +420,7 @@ $('#like-rotator-' + ident.toString()).show(); $.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate ); liking = 1; + force_update = true; } function dosubthread(ident) { @@ -505,6 +512,7 @@ commentClose(tarea,id); if(timer) clearTimeout(timer); timer = setTimeout(NavUpdate,10); + force_update = true; } if(data.reload) { window.location.href=data.reload; @@ -637,6 +645,7 @@ function notifyMarkAll() { $.get('notify/mark/all', function(data) { if(timer) clearTimeout(timer); timer = setTimeout(NavUpdate,1000); + force_update = true; }); } diff --git a/mod/item.php b/mod/item.php index ac8abac996..76ca991793 100644 --- a/mod/item.php +++ b/mod/item.php @@ -911,10 +911,6 @@ function item_post(&$a) { call_hooks('post_local_end', $datarray); - // if no auto update is enabled, then disable it temporarily - if (get_pconfig($profile_uid, "system", "no_auto_update") == 1) - set_pconfig($profile_uid, "system", "no_auto_update", -1); - if(strlen($emailcc) && $profile_uid == local_user()) { $erecips = explode(',', $emailcc); if(count($erecips)) { diff --git a/mod/like.php b/mod/like.php index 5ed58245ae..bbb0728965 100755 --- a/mod/like.php +++ b/mod/like.php @@ -136,10 +136,6 @@ function like_content(&$a) { // Save the author information for the unlike in case we need to relay to Diaspora store_diaspora_like_retract_sig($activity, $item, $like_item, $contact); - // if no auto update is enabled, then disable it temporarily - if (get_pconfig($owner_uid, "system", "no_auto_update") == 1) - set_pconfig($owner_uid, "system", "no_auto_update", -1); - // proc_run('php',"include/notifier.php","like","$post_id"); // $post_id isn't defined here! $like_item_id = $like_item['id']; proc_run('php',"include/notifier.php","like","$like_item_id"); @@ -222,10 +218,6 @@ EOT; // Save the author information for the like in case we need to relay to Diaspora store_diaspora_like_sig($activity, $post_type, $contact, $post_id); - // if no auto update is enabled, then disable it temporarily - if (get_pconfig($owner_uid, "system", "no_auto_update") == 1) - set_pconfig($owner_uid, "system", "no_auto_update", -1); - $arr['id'] = $post_id; call_hooks('post_local_end', $arr); diff --git a/mod/update_network.php b/mod/update_network.php index ff668ab353..9c6e45ca41 100644 --- a/mod/update_network.php +++ b/mod/update_network.php @@ -13,12 +13,9 @@ function update_network_content(&$a) { echo "\r\n"; echo (($_GET['msie'] == 1) ? '
' : '
'); - $no_auto_update = get_pconfig($profile_uid, "system", "no_auto_update"); - if (($no_auto_update <= 0) OR ($_GET['top'] == 1)) { + if (!get_pconfig($profile_uid, "system", "no_auto_update") OR ($_GET['force'] == 1)) $text = network_content($a,$profile_uid); - if ($no_auto_update < 0) - set_pconfig($profile_uid, "system", "no_auto_update", 1); - } else + else $text = ""; $pattern = "/]*) src=\"([^\"]*)\"/";