mirror of
https://github.com/friendica/friendica
synced 2025-04-25 02:30:11 +00:00
Remove pager parameter from conversation()
- Add getUrlParameter() Javascript function to determine current page
This commit is contained in:
parent
756de11cda
commit
0b0309ce8f
11 changed files with 42 additions and 22 deletions
|
@ -104,6 +104,20 @@ function decodeHtml(html) {
|
|||
return txt.value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves a single named query string parameter
|
||||
*
|
||||
* @param {string} name
|
||||
* @returns {string}
|
||||
* @see https://davidwalsh.name/query-string-javascript
|
||||
*/
|
||||
function getUrlParameter(name) {
|
||||
name = name.replace(/[\[]/, '\\[').replace(/[\]]/, '\\]');
|
||||
var regex = new RegExp('[\\?&]' + name + '=([^&#]*)');
|
||||
var results = regex.exec(location.search);
|
||||
return results === null ? '' : decodeURIComponent(results[1].replace(/\+/g, ' '));
|
||||
};
|
||||
|
||||
var src = null;
|
||||
var prev = null;
|
||||
var livetime = null;
|
||||
|
@ -511,7 +525,11 @@ function updateConvItems(data) {
|
|||
var ident = $(this).attr('id');
|
||||
|
||||
// Add new top-level item.
|
||||
if ($('#' + ident).length == 0 && profile_page == 1) {
|
||||
if ($('#' + ident).length === 0
|
||||
&& (!getUrlParameter('page')
|
||||
|| getUrlParameter('page') === '1'
|
||||
)
|
||||
) {
|
||||
$('#' + prev).after($(this));
|
||||
|
||||
// Replace already existing thread.
|
||||
|
@ -573,7 +591,12 @@ function liveUpdate(src) {
|
|||
var orgHeight = $("section").height();
|
||||
|
||||
var udargs = ((netargs.length) ? '/' + netargs : '');
|
||||
var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&force=' + ((force_update) ? 1 : 0) + '&item=' + update_item;
|
||||
|
||||
var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&force=' + ((force_update) ? 1 : 0) + '&item=' + update_item;
|
||||
|
||||
if (getUrlParameter('page')) {
|
||||
update_url += '&page=' + getUrlParameter('page');
|
||||
}
|
||||
|
||||
$.get(update_url,function(data) {
|
||||
in_progress = false;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue