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

bump minor version because of jquery update

Browse Source
This commit is contained in:
Mario Vavti 2016-07-15 14:53:15 +02:00
parent 4a2fb8336e
commit 9048f8cffe
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -44,7 +44,7 @@ require_once('include/account.php');
define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '1.9' ); define ( 'STD_VERSION', '1.9.1' );
define ( 'ZOT_REVISION', '1.1' ); define ( 'ZOT_REVISION', '1.1' );
define ( 'DB_UPDATE_VERSION', 1180 ); define ( 'DB_UPDATE_VERSION', 1180 );

11
view/js/main.js
View File

@ -653,7 +653,7 @@ function updateConvItems(mode,data) {
} }
function collapseHeight() { function collapseHeight() {
var origContentHeight = parseInt($("#region_2").height()); var origContentHeight = Math.ceil($("#region_2").height());
var cDiff = 0; var cDiff = 0;
var i = 0; var i = 0;
var position = $(window).scrollTop(); var position = $(window).scrollTop();
@ -663,19 +663,13 @@ function collapseHeight() {
if(orgHeight > divmore_height) { if(orgHeight > divmore_height) {
if(! $(this).hasClass('divmore')) { 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 // 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) { 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; diff = orgHeight - divmore_height;
cDiff = cDiff + diff; cDiff = cDiff + diff;
i++; i++;
} }
//if(trigger) {
$(this).readmore({ $(this).readmore({
speed: 0, speed: 0,
heightMargin: 50, heightMargin: 50,
@ -691,12 +685,11 @@ function collapseHeight() {
} }
}); });
$(this).addClass('divmore'); $(this).addClass('divmore');
//}
} }
} }
}); });
var collapsedContentHeight = parseInt($("#region_2").height()); var collapsedContentHeight = Math.ceil($("#region_2").height());
contentHeightDiff = origContentHeight - collapsedContentHeight; contentHeightDiff = origContentHeight - collapsedContentHeight;
console.log('collapseHeight() - contentHeightDiff: ' + contentHeightDiff + 'px'); console.log('collapseHeight() - contentHeightDiff: ' + contentHeightDiff + 'px');