diff options
| author | Mario <mario@mariovavti.com> | 2021-03-08 19:15:39 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-03-08 19:15:39 +0000 |
| commit | 1561e4a89c33d215c82e60fb4bcfdef0d925dcd7 (patch) | |
| tree | dfe0b56058df4b7f9e58b65172c9830478e29d91 /view | |
| parent | b09cbb72fbd64dd1555ce76d431c2dab6c323691 (diff) | |
| parent | 0e015d52a53960a45f57c8dbf3bb00054543703b (diff) | |
| download | volse-hubzilla-1561e4a89c33d215c82e60fb4bcfdef0d925dcd7.tar.gz volse-hubzilla-1561e4a89c33d215c82e60fb4bcfdef0d925dcd7.tar.bz2 volse-hubzilla-1561e4a89c33d215c82e60fb4bcfdef0d925dcd7.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'view')
| -rw-r--r-- | view/es-es/hstrings.php | 2 | ||||
| -rw-r--r-- | view/js/main.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index f77a1906c..097656a6c 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -2,7 +2,7 @@ if(! function_exists("string_plural_select_es_es")) { function string_plural_select_es_es($n){ - return ($n != 1); + return (n != 1 ? 1 : 0); }} App::$rtl = 0; App::$strings["plural_function_code"] = "(n != 1 ? 1 : 0)"; diff --git a/view/js/main.js b/view/js/main.js index 0c48c8b18..16dcd9cfe 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1574,7 +1574,7 @@ $(window).scroll(function () { } else { // This is some other kind of page - perhaps a directory - if($(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; |