aboutsummaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-09-25 21:22:36 -0700
committerfriendica <info@friendica.com>2013-09-25 21:22:36 -0700
commit6519433301a571d8e12ffa24b56534bb2e3afe5f (patch)
tree5aaea06e72cd8772eb4c5387423d1f480e194e97 /js
parent00e5ded1c892a94c79a854327b44d8673cc43274 (diff)
downloadvolse-hubzilla-6519433301a571d8e12ffa24b56534bb2e3afe5f.tar.gz
volse-hubzilla-6519433301a571d8e12ffa24b56534bb2e3afe5f.tar.bz2
volse-hubzilla-6519433301a571d8e12ffa24b56534bb2e3afe5f.zip
suppress creating the directory update record for profile updates which are part of the normal import_xchan sequence - otherwise we get two for every change. Create it normally if we are called with a profile_update message and don't go through the whole import_xchan thing.
Diffstat (limited to 'js')
-rw-r--r--js/main.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/main.js b/js/main.js
index 9d764c74e..cd5040064 100644
--- a/js/main.js
+++ b/js/main.js
@@ -119,6 +119,7 @@
var next_page = 1;
var page_load = true;
var loadingPage = false;
+ var pageHasMoreContent = true;
$(function() {
$.ajaxSetup({cache: false});
@@ -984,7 +985,7 @@ $(window).scroll(function () {
}
if($(window).scrollTop() + $(window).height() == $(document).height()) {
- if(! loadingPage) {
+ if((pageHasMoreContent) && (! loadingPage)) {
$('#more').hide();
$('#no-more').hide();
// alert('scroll');