diff --git a/Changelog.md b/Changelog.md
index 6eb0e65..a33e09c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,8 @@
+### 0.7.0(151225)
+
+* 增加默认判断内容过少自动加载下方内容
+* 优化`lock()`，默认智能判断，如加参数`lock('up')`锁定上方，如加参数`lock('down')`锁定下方
+
### 0.6.0(151218)
* 增加参数threshold提前加载距离
diff --git a/Intro.md b/Intro.md
new file mode 100644
index 0000000..247225a
--- /dev/null
+++ b/Intro.md
@@ -0,0 +1,27 @@
+### 0.7.0(151225)
+
+根据网友提议，默认内容过少时，自动触发加载下方内容，只会加载一次，如果内容还不够一屏，无法继续触发。并且修复`lock()`，增加参数可以手动锁定上方或者下方。
+
+### 0.6.0(151218)
+
+根据网友提议，增加提前加载距离threshold，适用于上拉加载更多功能。默认显示到加载区高度2/3时加载。
+
+### 0.5.0(151217)
+
+感谢交流群里网友各种吐槽上拉加载抖动。发现`touch`和`scroll`同时作用会发生抖动，干脆把上拉加载改为滑到底部自动加载。如依旧需要上拉加载效果，可以下载[releases0.4.0版本](https://github.com/ximan/dropload/releases/tag/0.4.0)。
+
+### 0.4.0(150927)
+
+根据网友提供demo，修改至适用大部分普通列表网页，终于可以大规模使用啦！
+
+### 0.3.0(150410)
+
+项目中通知列表有可编辑、删除等状态，需要锁定和解锁下拉刷新功能。
+
+### 0.2.0(150325)
+
+公司项目APP内嵌页需要下拉刷新，终于可以实战了！这一版大家可以开始使用和反馈。
+
+### 0.1.0(141024)
+
+虽然有**上拉加载更多**的需求，但一直都是用的scroll方法。写**dropload**完全是为了练习插件写法和touch的使用。
\ No newline at end of file
diff --git a/README.md b/README.md
index c91913b..3d967ec 100644
--- a/README.md
+++ b/README.md
@@ -4,29 +4,18 @@
## 背景介绍
-### 0.6.0(151218)
+根据网友提议，默认内容过少时，自动触发加载下方内容，只会加载一次，如果内容还不够一屏，无法继续触发。并且修复`lock()`，增加参数可以手动锁定上方或者下方。
-根据网友提议增加提前加载距离threshold，适用于上拉加载更多功能。默认显示到加载区高度2/3时加载。
+[历史背景介绍](Intro.md)
-### 0.5.0(151217)
-
-感谢交流群里网友各种吐槽上拉加载抖动。发现`touch`和`scroll`同时作用会发生抖动，干脆把上拉加载改为滑到底部自动加载。如依旧需要上拉加载效果，可以下载[releases0.4.0版本](https://github.com/ximan/dropload/releases/tag/0.4.0)。
-
-### 0.4.0(150927)
-
-根据网友提供demo，修改至适用大部分普通列表网页，终于可以大规模使用啦！
-
-### 0.3.0(150410)
-
-项目中通知列表有可编辑、删除等状态，需要锁定和解锁下拉刷新功能。
-
-### 0.2.0(150325)
+## 最新版本
-公司项目APP内嵌页需要下拉刷新，终于可以实战了！这一版大家可以开始使用和反馈。
+### 0.7.0(151225)
-### 0.1.0(141024)
+* 增加默认判断内容过少自动加载下方内容
+* 优化`lock()`，默认智能判断，如加参数`lock('up')`锁定上方，如加参数`lock('down')`锁定下方
-虽然有**上拉加载更多**的需求，但一直都是用的scroll方法。写**dropload**完全是为了练习插件写法和touch的使用。
+[所有更新日志](Changelog.md)
## 示例
@@ -93,17 +82,17 @@ $('.element').dropload({
`lock()` 锁定dropload
+| 参数 | 说明 |
+|----------------|----------------------------|
+| `lock()` | 智能锁定，锁定上一次加载的方向 |
+| `lock('up')` | 锁定上方 |
+| `lock('down')` | 锁定下方 |
+
`unlock()` 解锁dropload
`noData()` 无数据
-## 最新版本
-
-### 0.6.0(151218)
-
-* 增加参数threshold提前加载距离
-
-[所有更新日志](Changelog.md)
+`resetload()` 重置。每次数据加载完，必须重置
## dropload使用交流群
diff --git a/dist/dropload.js b/dist/dropload.js
index 0ab333b..7932b16 100644
--- a/dist/dropload.js
+++ b/dist/dropload.js
@@ -1,7 +1,7 @@
/**
* dropload
* 西门
- * 0.6.0(151218)
+ * 0.7.0(151225)
*/
;(function($){
@@ -21,7 +21,8 @@
// loading状态
me.loading = false;
// 是否锁定
- me.isLock = false;
+ me.isLockUp = false;
+ me.isLockDown = false;
// 是否有数据
me.isData = true;
me._scrollTop = 0;
@@ -70,6 +71,11 @@
me._scrollWindowHeight = me.$element.height();
}
+ // 如果文档高度不大于窗口高度，数据较少，自动加载下方数据
+ if(me._scrollContentHeight <= me._scrollWindowHeight){
+ fnLoadDown();
+ }
+
// 窗口调整
$win.on('resize',function(){
if(me.opts.scrollArea == win){
@@ -82,19 +88,19 @@
// 绑定触摸
me.$element.on('touchstart',function(e){
- if(!me.loading && !me.isLock){
+ if(!me.loading){
fnTouches(e);
fnTouchstart(e, me);
}
});
me.$element.on('touchmove',function(e){
- if(!me.loading && !me.isLock){
+ if(!me.loading){
fnTouches(e, me);
fnTouchmove(e, me);
}
});
me.$element.on('touchend',function(){
- if(!me.loading && !me.isLock){
+ if(!me.loading){
fnTouchend(me);
}
});
@@ -109,13 +115,18 @@
me._threshold = me.opts.threshold;
}
- if(me.opts.loadDownFn != '' && !me.loading && !me.isLock && (me._scrollContentHeight - me._threshold) <= (me._scrollWindowHeight + me._scrollTop)){
- me.direction = 'up';
- me.$domDown.html(me.opts.domDown.domLoad);
- me.loading = true;
- me.opts.loadDownFn(me);
+ if(me.opts.loadDownFn != '' && !me.loading && !me.isLockDown && (me._scrollContentHeight - me._threshold) <= (me._scrollWindowHeight + me._scrollTop)){
+ fnLoadDown();
}
});
+
+ // 加载下方方法
+ function fnLoadDown(){
+ me.direction = 'up';
+ me.$domDown.html(me.opts.domDown.domLoad);
+ me.loading = true;
+ me.opts.loadDownFn(me);
+ }
};
// touches
@@ -146,7 +157,7 @@
var _absMoveY = Math.abs(me._moveY);
// 加载上方
- if(me.opts.loadUpFn != '' && me.touchScrollTop <= 0 && me.direction == 'down'){
+ if(me.opts.loadUpFn != '' && me.touchScrollTop <= 0 && me.direction == 'down' && !me.isLockUp){
e.preventDefault();
me.$domUp = $('.'+me.opts.domUp.domClass);
@@ -179,7 +190,7 @@
// touchend
function fnTouchend(me){
var _absMoveY = Math.abs(me._moveY);
- if(me.opts.loadUpFn != '' && me.touchScrollTop <= 0 && me.direction == 'down'){
+ if(me.opts.loadUpFn != '' && me.touchScrollTop <= 0 && me.direction == 'down' && !me.isLockUp){
fnTransition(me.$domUp,300);
if(_absMoveY > me.opts.distance){
@@ -207,15 +218,35 @@
}
// 锁定
- MyDropLoad.prototype.lock = function(){
+ MyDropLoad.prototype.lock = function(direction){
var me = this;
- me.isLock = true;
+ // 如果不指定方向
+ if(direction === undefined){
+ // 如果操作方向向上
+ if(me.direction == 'up'){
+ me.isLockDown = true;
+ // 如果操作方向向下
+ }else if(me.direction == 'down'){
+ me.isLockUp = true;
+ }else{
+ me.isLockUp = true;
+ me.isLockDown = true;
+ }
+ // 如果指定锁上方
+ }else if(direction == 'up'){
+ me.isLockUp = true;
+ // 如果指定锁下方
+ }else if(direction == 'down'){
+ me.isLockDown = true;
+ }
};
// 解锁
MyDropLoad.prototype.unlock = function(){
var me = this;
- me.isLock = false;
+ // 简单粗暴解锁
+ me.isLockUp = false;
+ me.isLockDown = false;
};
// 无数据
@@ -228,7 +259,7 @@
MyDropLoad.prototype.resetload = function(){
var me = this;
if(me.direction == 'down' && me.upInsertDOM){
- me.$domUp.css({'height':'0'}).on('webkitTransitionEnd transitionend',function(){
+ me.$domUp.css({'height':'0'}).on('webkitTransitionEnd mozTransitionEnd transitionend',function(){
me.loading = false;
me.upInsertDOM = false;
$(this).remove();
diff --git a/dist/dropload.min.js b/dist/dropload.min.js
index c2cd9fb..99571c1 100644
--- a/dist/dropload.min.js
+++ b/dist/dropload.min.js
@@ -1,6 +1,6 @@
/**
* dropload
* 西门
- * 0.6.0(151218)
+ * 0.7.0(151225)
*/
-!function(a){"use strict";function g(a){a.touches||(a.touches=a.originalEvent.touches)}function h(a,b){b._startY=a.touches[0].pageY,b.touchScrollTop=b.$scrollArea.scrollTop()}function i(b,c){c._curY=b.touches[0].pageY,c._moveY=c._curY-c._startY,c._moveY>0?c.direction="down":c._moveY<0&&(c.direction="up");var d=Math.abs(c._moveY);""!=c.opts.loadUpFn&&c.touchScrollTop<=0&&"down"==c.direction&&(b.preventDefault(),c.$domUp=a("."+c.opts.domUp.domClass),c.upInsertDOM||(c.$element.prepend(''),c.upInsertDOM=!0),l(c.$domUp,0),d<=c.opts.distance?(c._offsetY=d,c.$domUp.html(c.opts.domUp.domRefresh)):d>c.opts.distance&&d<=2*c.opts.distance?(c._offsetY=c.opts.distance+.5*(d-c.opts.distance),c.$domUp.html(c.opts.domUp.domUpdate)):c._offsetY=c.opts.distance+.5*c.opts.distance+.2*(d-2*c.opts.distance),c.$domUp.css({height:c._offsetY}))}function j(b){var c=Math.abs(b._moveY);""!=b.opts.loadUpFn&&b.touchScrollTop<=0&&"down"==b.direction&&(l(b.$domUp,300),c>b.opts.distance?(b.$domUp.css({height:b.$domUp.children().height()}),b.$domUp.html(b.opts.domUp.domLoad),b.loading=!0,b.opts.loadUpFn(b)):b.$domUp.css({height:"0"}).on("webkitTransitionEnd transitionend",function(){b.upInsertDOM=!1,a(this).remove()}),b._moveY=0)}function k(a){a._scrollContentHeight=a.opts.scrollArea==b?e.height():a.$element[0].scrollHeight}function l(a,b){a.css({"-webkit-transition":"all "+b+"ms",transition:"all "+b+"ms"})}var f,b=window,c=document,d=a(b),e=a(c);a.fn.dropload=function(a){return new f(this,a)},f=function(b,c){var d=this;d.$element=a(b),d.upInsertDOM=!1,d.loading=!1,d.isLock=!1,d.isData=!0,d._scrollTop=0,d.init(c)},f.prototype.init=function(f){var k=this;k.opts=a.extend({},{scrollArea:k.$element,domUp:{domClass:"dropload-up",domRefresh:'↓下拉刷新
',domUpdate:'↑释放更新
',domLoad:'加载中...
'},domDown:{domClass:"dropload-down",domRefresh:'↑上拉加载更多
',domLoad:'加载中...
',domNoData:'暂无数据
'},distance:50,threshold:"",loadUpFn:"",loadDownFn:""},f),""!=k.opts.loadDownFn&&(k.$element.append(''+k.opts.domDown.domRefresh+"
"),k.$domDown=a("."+k.opts.domDown.domClass)),k.opts.scrollArea==b?(k.$scrollArea=d,k._scrollContentHeight=e.height(),k._scrollWindowHeight=c.documentElement.clientHeight):(k.$scrollArea=k.opts.scrollArea,k._scrollContentHeight=k.$element[0].scrollHeight,k._scrollWindowHeight=k.$element.height()),d.on("resize",function(){k._scrollWindowHeight=k.opts.scrollArea==b?b.innerHeight:k.$element.height()}),k.$element.on("touchstart",function(a){k.loading||k.isLock||(g(a),h(a,k))}),k.$element.on("touchmove",function(a){k.loading||k.isLock||(g(a,k),i(a,k))}),k.$element.on("touchend",function(){k.loading||k.isLock||j(k)}),k.$scrollArea.on("scroll",function(){k._scrollTop=k.$scrollArea.scrollTop(),k._threshold=""===k.opts.threshold?Math.floor(1*k.$domDown.height()/3):k.opts.threshold,""!=k.opts.loadDownFn&&!k.loading&&!k.isLock&&k._scrollContentHeight-k._threshold<=k._scrollWindowHeight+k._scrollTop&&(k.direction="up",k.$domDown.html(k.opts.domDown.domLoad),k.loading=!0,k.opts.loadDownFn(k))})},f.prototype.lock=function(){var a=this;a.isLock=!0},f.prototype.unlock=function(){var a=this;a.isLock=!1},f.prototype.noData=function(){var a=this;a.isData=!1},f.prototype.resetload=function(){var b=this;"down"==b.direction&&b.upInsertDOM?b.$domUp.css({height:"0"}).on("webkitTransitionEnd transitionend",function(){b.loading=!1,b.upInsertDOM=!1,a(this).remove(),k(b)}):"up"==b.direction&&(b.loading=!1,b.isData?(b.$domDown.html(b.opts.domDown.domRefresh),k(b)):b.$domDown.html(b.opts.domDown.domNoData))}}(window.Zepto||window.jQuery);
\ No newline at end of file
+!function(a){"use strict";function g(a){a.touches||(a.touches=a.originalEvent.touches)}function h(a,b){b._startY=a.touches[0].pageY,b.touchScrollTop=b.$scrollArea.scrollTop()}function i(b,c){c._curY=b.touches[0].pageY,c._moveY=c._curY-c._startY,c._moveY>0?c.direction="down":c._moveY<0&&(c.direction="up");var d=Math.abs(c._moveY);""!=c.opts.loadUpFn&&c.touchScrollTop<=0&&"down"==c.direction&&!c.isLockUp&&(b.preventDefault(),c.$domUp=a("."+c.opts.domUp.domClass),c.upInsertDOM||(c.$element.prepend(''),c.upInsertDOM=!0),l(c.$domUp,0),d<=c.opts.distance?(c._offsetY=d,c.$domUp.html(c.opts.domUp.domRefresh)):d>c.opts.distance&&d<=2*c.opts.distance?(c._offsetY=c.opts.distance+.5*(d-c.opts.distance),c.$domUp.html(c.opts.domUp.domUpdate)):c._offsetY=c.opts.distance+.5*c.opts.distance+.2*(d-2*c.opts.distance),c.$domUp.css({height:c._offsetY}))}function j(b){var c=Math.abs(b._moveY);""!=b.opts.loadUpFn&&b.touchScrollTop<=0&&"down"==b.direction&&!b.isLockUp&&(l(b.$domUp,300),c>b.opts.distance?(b.$domUp.css({height:b.$domUp.children().height()}),b.$domUp.html(b.opts.domUp.domLoad),b.loading=!0,b.opts.loadUpFn(b)):b.$domUp.css({height:"0"}).on("webkitTransitionEnd transitionend",function(){b.upInsertDOM=!1,a(this).remove()}),b._moveY=0)}function k(a){a._scrollContentHeight=a.opts.scrollArea==b?e.height():a.$element[0].scrollHeight}function l(a,b){a.css({"-webkit-transition":"all "+b+"ms",transition:"all "+b+"ms"})}var f,b=window,c=document,d=a(b),e=a(c);a.fn.dropload=function(a){return new f(this,a)},f=function(b,c){var d=this;d.$element=a(b),d.upInsertDOM=!1,d.loading=!1,d.isLockUp=!1,d.isLockDown=!1,d.isData=!0,d._scrollTop=0,d.init(c)},f.prototype.init=function(f){function l(){k.direction="up",k.$domDown.html(k.opts.domDown.domLoad),k.loading=!0,k.opts.loadDownFn(k)}var k=this;k.opts=a.extend({},{scrollArea:k.$element,domUp:{domClass:"dropload-up",domRefresh:'↓下拉刷新
',domUpdate:'↑释放更新
',domLoad:'加载中...
'},domDown:{domClass:"dropload-down",domRefresh:'↑上拉加载更多
',domLoad:'加载中...
',domNoData:'暂无数据
'},distance:50,threshold:"",loadUpFn:"",loadDownFn:""},f),""!=k.opts.loadDownFn&&(k.$element.append(''+k.opts.domDown.domRefresh+"
"),k.$domDown=a("."+k.opts.domDown.domClass)),k.opts.scrollArea==b?(k.$scrollArea=d,k._scrollContentHeight=e.height(),k._scrollWindowHeight=c.documentElement.clientHeight):(k.$scrollArea=k.opts.scrollArea,k._scrollContentHeight=k.$element[0].scrollHeight,k._scrollWindowHeight=k.$element.height()),k._scrollContentHeight<=k._scrollWindowHeight&&l(),d.on("resize",function(){k._scrollWindowHeight=k.opts.scrollArea==b?b.innerHeight:k.$element.height()}),k.$element.on("touchstart",function(a){k.loading||(g(a),h(a,k))}),k.$element.on("touchmove",function(a){k.loading||(g(a,k),i(a,k))}),k.$element.on("touchend",function(){k.loading||j(k)}),k.$scrollArea.on("scroll",function(){k._scrollTop=k.$scrollArea.scrollTop(),k._threshold=""===k.opts.threshold?Math.floor(1*k.$domDown.height()/3):k.opts.threshold,""!=k.opts.loadDownFn&&!k.loading&&!k.isLockDown&&k._scrollContentHeight-k._threshold<=k._scrollWindowHeight+k._scrollTop&&l()})},f.prototype.lock=function(a){var b=this;void 0===a?"up"==b.direction?b.isLockDown=!0:"down"==b.direction?b.isLockUp=!0:(b.isLockUp=!0,b.isLockDown=!0):"up"==a?b.isLockUp=!0:"down"==a&&(b.isLockDown=!0)},f.prototype.unlock=function(){var a=this;a.isLockUp=!1,a.isLockDown=!1},f.prototype.noData=function(){var a=this;a.isData=!1},f.prototype.resetload=function(){var b=this;"down"==b.direction&&b.upInsertDOM?b.$domUp.css({height:"0"}).on("webkitTransitionEnd mozTransitionEnd transitionend",function(){b.loading=!1,b.upInsertDOM=!1,a(this).remove(),k(b)}):"up"==b.direction&&(b.loading=!1,b.isData?(b.$domDown.html(b.opts.domDown.domRefresh),k(b)):b.$domDown.html(b.opts.domDown.domNoData))}}(window.Zepto||window.jQuery);
\ No newline at end of file
diff --git a/examples/load-bottom.html b/examples/load-bottom.html
index 5cfdbc8..6b403e0 100644
--- a/examples/load-bottom.html
+++ b/examples/load-bottom.html
@@ -130,36 +130,6 @@ 5文字描述文字描述文字描述文字描述文字描述
6文字描述文字描述文字描述文字描述文字描述
2014-14-14
-
- 
- 7文字描述文字描述文字描述文字描述文字描述
- 2014-14-14
-
-
-
- 8文字描述文字描述文字描述文字描述文字描述
- 2014-14-14
-
-
-
- 9文字描述文字描述文字描述文字描述文字描述
- 2014-14-14
-
-
-
- 10文字描述文字描述文字描述文字描述文字描述
- 2014-14-14
-
-
-
- 11文字描述文字描述文字描述文字描述文字描述
- 2014-14-14
-
-
-
- 12文字描述文字描述文字描述文字描述文字描述
- 2014-14-14
-