diff options
| author | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-09 21:32:25 +0100 |
|---|---|---|
| committer | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-09 21:32:25 +0100 |
| commit | ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687 (patch) | |
| tree | cf1aa37d881f2ce3cb844bbcd5c11c5999e96c66 /view/js/main.js | |
| parent | 652ec8c3fcc956c1a5fc2adb7410e4c4a2ac6f90 (diff) | |
| parent | 409c89d629993b59eaafa8443ae9d0b5f0344c1f (diff) | |
| download | volse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.tar.gz volse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.tar.bz2 volse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js index b5b77d473..8c4fcdc13 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -285,7 +285,7 @@ scroll_next = true; loadingPage = true; - if($('.directory-end').length == 0) + if(($('.directory-end').length == 0) && ($('.photos-end').length == 0)) liveUpdate(); else pageUpdate(); @@ -689,7 +689,7 @@ function updateConvItems(mode,data) { bParam_page = 1; } - update_url = baseurl + '/directory/?f=&aj=1&page=' + bParam_page; + update_url = baseurl + '/' + page_query + '/?f=&aj=1&page=' + bParam_page + extra_args ; $("#page-spinner").spin('small'); update_mode = 'append'; |