|
|
@@ -121,7 +121,8 @@ var gagaInfiniteScroll = {
|
|
|
|
|
|
console.log('historyData.backScroll:::'+historyData.scroll);
|
|
|
console.log('infiniteContainer:::'+$("#infiniteContainer").height());
|
|
|
- gagaInfiniteScroll.draw(historyData.htm, historyData.scroll, 0);
|
|
|
+ gagaInfiniteScroll.draw(historyData.htm);
|
|
|
+ // gagaInfiniteScroll.draw(historyData.htm, historyData.scroll, 0);
|
|
|
};
|
|
|
|
|
|
$(window).on('scroll', function() {
|
|
|
@@ -161,11 +162,11 @@ var gagaInfiniteScroll = {
|
|
|
, gagaInfiniteScroll.pageStatus.backScroll
|
|
|
);
|
|
|
if (scrollTop && containerHeight) {
|
|
|
- console.log('here3');
|
|
|
+ // console.log('here3');
|
|
|
// gagaInfiniteScroll.obj.$window.scrollTop.scrollTop(0).scrollTop(scrollTop);
|
|
|
} else {
|
|
|
- console.log('here4');
|
|
|
- gagaInfiniteScroll.obj.$window.scrollTop = scrollTop+1;
|
|
|
+ // console.log('here4');
|
|
|
+ // gagaInfiniteScroll.obj.$window.scrollTop = scrollTop+1;
|
|
|
// gagaInfiniteScroll.obj.$window.scrollTop(scrollTop+1);
|
|
|
// gagaInfiniteScroll.obj.$window.scrollTop(gagaInfiniteScroll.obj.$window.scrollTop() + 1);
|
|
|
}
|
|
|
@@ -178,12 +179,13 @@ var gagaInfiniteScroll = {
|
|
|
|
|
|
console.log('scrollTop::'+scrollTop);
|
|
|
console.log('containerHeight::'+containerHeight);
|
|
|
- if (scrollTop ) { //&& containerHeight
|
|
|
- console.log('here5');
|
|
|
+ if (scrollTop && containerHeight) { //&& containerHeight
|
|
|
+ // console.log('here5');
|
|
|
// gagaInfiniteScroll.obj.$window.scrollTop.scrollTop(0).scrollTop(scrollTop);
|
|
|
- gagaInfiniteScroll.obj.$window.scrollTop = scrollTop;
|
|
|
+ // gagaInfiniteScroll.obj.$window.scrollTop = scrollTop;
|
|
|
} else {
|
|
|
- $(window).scrollTop($(window).scrollTop() + 1);
|
|
|
+ // console.log('here6');
|
|
|
+ // $(window).scrollTop($(window).scrollTop() + 1);
|
|
|
}
|
|
|
|
|
|
this.pageStatus.loadAlign = 'not';
|