Skip to content

Commit

Permalink
sync
Browse files Browse the repository at this point in the history
  • Loading branch information
@balibell
balibell committed Mar 14, 2014
1 parent 20b1451 commit bc5dfbb
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 16 deletions.
6 changes: 3 additions & 3 deletions css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ div.my-pic .mbpho .k img{float:left;+display:inline;margin:0 4px 4px 0;}
/* 分享者信息 收集数 回复数 */
.my-pic .w{clear:both;height:18px;overflow:hidden;padding:0 11px 12px 11px;margin:0;background-color:#f8f8f8;}
/* list 页面结合 42px 高度的区域 */
.my-pic div.d{overflow:hidden;height:28px;padding:0 11px 0 11px;background-color:#fff;margin:0;border-bottom:1px solid #efeeed;/*background:url(../../../../img/0/dtbutton.gif?20120106) 0 -568px no-repeat;*/}
.my-pic div.d{overflow:hidden;height:28px;padding:0 11px 0 11px;background-color:#fff;margin:0;border-bottom:1px solid #efeeed;}
.my-pic .d span{float:left;+display:inline;line-height:19px;padding:0 0 0 22px;margin:0 12px 0 0;background-image:url("http://cdn.duitang.com/uploads/files/201211/26/20121126121246_VXE8F.png");_background-image:url("http://cdn.duitang.com/uploads/files/201211/30/20121130160101_ePSJe.png");background-repeat:no-repeat;font-size:14px;color:#b4b4b4;}
.my-pic .d .d1{background-position:-220px 0;}
.my-pic .d .d1-done{background-position:-320px 0;}
Expand All @@ -39,11 +39,11 @@ div.my-pic .mbpho .k img{float:left;+display:inline;margin:0 4px 4px 0;}
.my-pic .d .d4{background-position:-220px -60px;}
.my-pic .d .d5{background-position:-220px -80px;}
/* 回复列表 */
.my-pic ul{padding:0 0 8px 0;background-color:#f8f8f8;}
.my-pic ul{zoom:1;display:block;padding:0 0 8px 0;background-color:#f8f8f8;}
.my-pic li{zoom:1;padding:8px 0 7px 0;margin:0 11px 0 11px;border-top:1px solid #efeeed;}
.my-pic li:after{content:"\0020";display:block;height:0;overflow:hidden;clear:both;}
.my-pic li img{float:left;+display:inline;margin:0 8px 0 0;}
.my-pic li p{float:left;width:165px;word-wrap:break-word;word-break:break-all;overflow:hidden;}
.my-pic li p{float:left;+display:inline;width:165px;word-wrap:break-word;word-break:break-all;overflow:hidden;}
.my-pic li i{font-size:10px;color:#bbb;margin-left:4px}
/*###################################################*/

Expand Down
3 changes: 0 additions & 3 deletions js/masnunit.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ if(!String.prototype.cut){
try{
var jsn = $.isPlainObject(h) ? h : $.parseJSON(h)
}catch(e){
console.log(e)
// 如果parse 失败，直接返回初始状态的 ret;
return ret;
}
Expand Down Expand Up @@ -219,7 +218,6 @@ if(!String.prototype.cut){
try{
var jsn = $.isPlainObject(h) ? h : $.parseJSON(h)
}catch(e){
console.log(e)
// 如果parse 失败，直接返回初始状态的 ret;
return ret;
}
Expand Down Expand Up @@ -257,7 +255,6 @@ if(!String.prototype.cut){
try{
var jsn = $.isPlainObject(h) ? h : $.parseJSON(h)
}catch(e){
console.log(e)
// 如果parse 失败，直接返回初始状态的 ret;
return ret;
}
Expand Down
32 changes: 22 additions & 10 deletions js/woo.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -956,9 +956,9 @@
if( !SCROLLINGTOTOP ){
var tp = $W.scrollTop();
// 如果已经确认scrollbar 拉到底部了
if( PAGINE[IDX] && !PAGINE[IDX].lazyAdding && tp + WH > $('body').height() - Woo.conf.lbias ){
if( PAGINE[IDX] && PAGINE[IDX].hasTouchedBottom() ){
// pageinate 绑定的scroll事件 第二个参数不再作scroll 高度判断直接进入
PAGINE[IDX].doLazyAdd(tp,true),
PAGINE[IDX].doLazyAdd(),
PAGINE[IDX].doLoadNext();
//////////
}
Expand Down Expand Up @@ -1444,14 +1444,17 @@

error : function (x,statustext){
if(!prepare){
$('<div id="woo-retry" style="text-align:center;padding:8px 0 0;height:32px">网络繁忙，<a href="javascript:;">点此重试~</a></div>')
$('<div id="woo-retry" style="text-align:center;padding:12px 0 0;height:28px">网络繁忙，<a href="javascript:;">点此重试~</a></div>')
.click(function (e){
e.stopPropagation(),
e.preventDefault(),
pg._requestData(cp,sub),
$(this).remove();
pg.$loadingsm.css('display','block');
})
.insertAfter(pg.$dom);

pg.$loadingsm.css('display','none');
}
pg._requestAlways()
}
Expand Down Expand Up @@ -1525,7 +1528,7 @@

if( pg.isLastSub() ){
// 以下是配置普通翻页器的html 字符串
strPager = ['<div class="woo-pbr"><ul class="woo-dib">',
strPager = ['<div class="woo-pbr woo-mpbr"><ul class="woo-dib">',
cup==1 ? '' : '<li><a class="woo-pre" href="javascript:;" pdir="-1" >上一页</a></li>' ,
cup==1 ? '<li class="woo-cur">1</li>' : '<li><a href="javascript:;">1</a></li>',
cup-nn > 2 ? '<li class="woo-ell" >…</li>' : '',
Expand All @@ -1547,11 +1550,11 @@
'</ul></div>'].join('');


pg.$pager.find('.woo-pbr').remove(),
pg.$pager.find('.woo-mpbr').remove(),
pg.$pager.append(strPager);
}
else{
pg.$pager.find('.woo-pbr').remove(),
pg.$pager.find('.woo-mpbr').remove(),
pg.$pager.append(strPager);
}

Expand Down Expand Up @@ -1625,13 +1628,13 @@
pg.$pager.unbind('click.woo').bind('click.woo',{"pager":pg}, pg._pagerClick)
},


/*
@说明：判断是否触发 lazyAdd
@说明：是否触底
@参数
wt - 传入的 window scrollTop 数值
imm - 直接进入 lazyAdd
*/
doLazyAdd : function (wt,imm){
hasTouchedBottom : function (wt){
var pg = this,
c = pg.config,
wt = wt === undefined ? $W.scrollTop() : wt,
Expand All @@ -1640,8 +1643,17 @@
mx = Math.max.apply(Math,dacol),
mi = Math.min.apply(Math,dacol);

return ( distance < c.scrollBias || distance < mx - mi );
},

/*
@说明：否触发 lazyAdd
*/
doLazyAdd : function (){
var pg = this,
c = pg.config;

if( !pg.lazyAdding && pg.pagerVisible && pg.caching && ( imm || distance < c.scrollBias || distance < mx - mi ) ){
if( !pg.lazyAdding && pg.pagerVisible && pg.caching ){
c.lazyAdd.call(pg);
}
},
Expand Down

0 comments on commit bc5dfbb

Please sign in to comment.