aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2023-09-21 09:14:15 +0000
committerMario <mario@mariovavti.com>2023-09-21 09:14:15 +0000
commit1ced89a869483e693540129df64efd4411a50058 (patch)
tree45ceebb632025063965b785c215bb3051a2e73a3
parenta5e32dc3de997c3a3d9046161ce1ec149abb65c1 (diff)
downloadvolse-hubzilla-1ced89a869483e693540129df64efd4411a50058.tar.gz
volse-hubzilla-1ced89a869483e693540129df64efd4411a50058.tar.bz2
volse-hubzilla-1ced89a869483e693540129df64efd4411a50058.zip
fix javascript error
-rw-r--r--Zotlabs/Module/Hq.php1
-rw-r--r--view/js/main.js4
2 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php
index 4fb1891d5..5c3ae9273 100644
--- a/Zotlabs/Module/Hq.php
+++ b/Zotlabs/Module/Hq.php
@@ -85,6 +85,7 @@ class Hq extends \Zotlabs\Web\Controller {
$x = [
'is_owner' => true,
+ 'profile_uid' => $channel['channel_id'],
'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''),
'default_location' => $channel['channel_location'],
'nickname' => $channel['channel_address'],
diff --git a/view/js/main.js b/view/js/main.js
index ced1a517e..d022ee4a9 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1584,7 +1584,7 @@ function zFormError(elm,x) {
$(window).scroll(function () {
if(typeof buildCmd == 'function') {
// This is a content page with items and/or conversations
- if($(window).scrollTop() + $(window).height() > $('#conversation-end').position().top) {
+ if($('#conversation-end').length && ($(window).scrollTop() + $(window).height()) > $('#conversation-end').position().top) {
if((pageHasMoreContent) && (! loadingPage)) {
next_page++;
scroll_next = true;
@@ -1595,7 +1595,7 @@ $(window).scroll(function () {
}
else {
// This is some other kind of page - perhaps a directory
- if($('#page-end').length && ($(window).scrollTop() + $(window).height() > $('#page-end').position().top)) {
+ if($('#page-end').length && ($(window).scrollTop() + $(window).height()) > $('#page-end').position().top) {
if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) {
next_page++;
scroll_next = true;