aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-10-13 20:09:11 -0700
committerfriendica <info@friendica.com>2013-10-13 20:09:11 -0700
commit454aa6bff38ee540b7467f3caa3d6651b70f14ef (patch)
tree7bfc7bec499fe13229e447c401bf0d2b213f5c17
parentbae7f4e07868563637594edb81933fc5f3ed49cf (diff)
downloadvolse-hubzilla-454aa6bff38ee540b7467f3caa3d6651b70f14ef.tar.gz
volse-hubzilla-454aa6bff38ee540b7467f3caa3d6651b70f14ef.tar.bz2
volse-hubzilla-454aa6bff38ee540b7467f3caa3d6651b70f14ef.zip
turn off endless scroll if we have no more content to load - currently for mod_display, need to add to other content modules
-rwxr-xr-xinclude/items.php1
-rw-r--r--js/main.js4
-rw-r--r--mod/display.php2
3 files changed, 6 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php
index 28aa632ca..2229da5db 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1825,6 +1825,7 @@ function item_store_update($arr,$allow_exec = false) {
unset($arr['id']);
unset($arr['uid']);
+
if(array_key_exists('edit',$arr))
unset($arr['edit']);
$arr['mimetype'] = ((x($arr,'mimetype')) ? notags(trim($arr['mimetype'])) : 'text/bbcode');
diff --git a/js/main.js b/js/main.js
index d5260a4be..11a3b360c 100644
--- a/js/main.js
+++ b/js/main.js
@@ -137,7 +137,9 @@
e.tipTip({defaultPosition: pos, edgeOffset: 8});
});*/
-
+ var e = document.getElementById('content-complete');
+ if(typeof e !== 'undefined')
+ pageHasMoreContent = false;
/* setup onoff widgets */
$(".onoff input").each(function(){
diff --git a/mod/display.php b/mod/display.php
index c9f6595c6..41df5fca6 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -166,6 +166,8 @@ function display_content(&$a, $update = 0, $load = false) {
);
}
+ $o .= '<div id="content-complete"></div>';
+
return $o;