mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 01:35:12 +00:00
bump minor version because of jquery update
This commit is contained in:
parent
4a2fb8336e
commit
9048f8cffe
2 changed files with 3 additions and 10 deletions
2
boot.php
2
boot.php
|
@ -44,7 +44,7 @@ require_once('include/account.php');
|
|||
|
||||
|
||||
define ( 'PLATFORM_NAME', 'hubzilla' );
|
||||
define ( 'STD_VERSION', '1.9' );
|
||||
define ( 'STD_VERSION', '1.9.1' );
|
||||
define ( 'ZOT_REVISION', '1.1' );
|
||||
|
||||
define ( 'DB_UPDATE_VERSION', 1180 );
|
||||
|
|
|
@ -653,7 +653,7 @@ function updateConvItems(mode,data) {
|
|||
}
|
||||
|
||||
function collapseHeight() {
|
||||
var origContentHeight = parseInt($("#region_2").height());
|
||||
var origContentHeight = Math.ceil($("#region_2").height());
|
||||
var cDiff = 0;
|
||||
var i = 0;
|
||||
var position = $(window).scrollTop();
|
||||
|
@ -663,19 +663,13 @@ function collapseHeight() {
|
|||
if(orgHeight > divmore_height) {
|
||||
if(! $(this).hasClass('divmore')) {
|
||||
|
||||
//var trigger = $(window).scrollTop() < $(this).offset().top ? true : false;
|
||||
//console.log($(this).offset().top + divmore_height - $(window).scrollTop() + cDiff - ($(".divgrow-showmore").outerHeight() * i));
|
||||
|
||||
// check if we will collapse some content above the visible content and compensate the diff later
|
||||
if($(this).offset().top + divmore_height - $(window).scrollTop() + cDiff - ($(".divgrow-showmore").outerHeight() * i) < 65) {
|
||||
//$(this).css('color', 'red');
|
||||
//console.log($(this).offset().top + divmore_height + ' / ' + $(window).scrollTop());
|
||||
diff = orgHeight - divmore_height;
|
||||
cDiff = cDiff + diff;
|
||||
i++;
|
||||
}
|
||||
|
||||
//if(trigger) {
|
||||
$(this).readmore({
|
||||
speed: 0,
|
||||
heightMargin: 50,
|
||||
|
@ -691,12 +685,11 @@ function collapseHeight() {
|
|||
}
|
||||
});
|
||||
$(this).addClass('divmore');
|
||||
//}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
var collapsedContentHeight = parseInt($("#region_2").height());
|
||||
var collapsedContentHeight = Math.ceil($("#region_2").height());
|
||||
contentHeightDiff = origContentHeight - collapsedContentHeight;
|
||||
console.log('collapseHeight() - contentHeightDiff: ' + contentHeightDiff + 'px');
|
||||
|
||||
|
|
Loading…
Reference in a new issue