keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bugfix: There were speed problems with inifinite scroll on firefox

Browse source
This commit is contained in:
Michael Vogel 2013-11-03 13:47:59 +01:00
parent eaefcf9de7
commit 0b31aa963d
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/bbcode.php
View file

@ -267,9 +267,11 @@ function bb_ShareAttributes($match) {
preg_match('/posted="(.*?)"/ism', $attributes, $matches);
if ($matches[1] != "")
$posted = $matches[1];
$reldate = (($posted) ? " " . relative_date($posted) : '');
$headline = '<br /><div class="shared_header">';
$reldate = (($posted) ? " " . relative_date($posted) : '');
$headline = '<div class="shared_header">';
//$headline = '<br /><div class="shared_header">';
if ($avatar != "")
$headline .= '<img src="'.$avatar.'" height="32" width="32" >';

16
index.php
View file

@ -494,13 +494,15 @@ var num = $pageno;
$(window).scroll(function(e){
// First method that is expected to work - but has problems with Chrome
if ($(window).scrollTop() == $(document).height() - $(window).height())
loadcontent();
// This method works with Chrome
if ($(window).scrollTop() > (($("section").height() + $("header").height() + $("footer").height()) - $(window).height()))
loadcontent();
if ($(document).height() != $(window).height()) {
// First method that is expected to work - but has problems with Chrome
if ($(window).scrollTop() == $(document).height() - $(window).height())
loadcontent();
} else {
// This method works with Chrome - but seems to be much slower in Firefox
if ($(window).scrollTop() > (($("section").height() + $("header").height() + $("footer").height()) - $(window).height()))
loadcontent();
}
});
</script>