harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not make a difference if there are images or not for now

Browse Source
This commit is contained in:
Mario Vavti 2016-01-30 01:34:27 +01:00
parent da198fdda5
commit b6543beca2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
view/js/main.js
View File

@ -625,7 +625,7 @@ function updateConvItems(mode,data) {
bimgs.load(function() { bimgs.load(function() {
bimgcount--; bimgcount--;
if (! bimgcount) { if (! bimgcount) {
collapseHeight(true); collapseHeight();
} }
}); });
} else { } else {
@ -634,13 +634,13 @@ function updateConvItems(mode,data) {
} }
function collapseHeight(below=false) { function collapseHeight() {
var origContentHeight = parseInt($("#region_2").height()); var origContentHeight = parseInt($("#region_2").height());
$(".wall-item-content, .directory-collapse").each(function() { $(".wall-item-content, .directory-collapse").each(function() {
var orgHeight = parseInt($(this).height()); var orgHeight = parseInt($(this).height());
if(orgHeight > divmore_height) { if(orgHeight > divmore_height) {
if(! $(this).hasClass('divmore')) { if(! $(this).hasClass('divmore')) {
if((below=true) && ($(window).scrollTop() + ($(window).height() - divmore_height) < $(this).offset().top)) { if($(window).scrollTop() + ($(window).height() - divmore_height) < $(this).offset().top) {
$(this).readmore({ $(this).readmore({
speed: 0, speed: 0,
heightMargin: 50, heightMargin: 50,