v1.1.2

TopuNet · Aug 12, 2016 · 91d8eaf · 91d8eaf
1 parent 4202108
commit 91d8eaf
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# dropDownLoad 插件 v1.1.1     ![233](https://raw.githubusercontent.com/TopuNet/dropDownLoad/master/demo/images/16471b1b26636f263a21115df68cb769.gif)
+# dropDownLoad 插件 v1.1.2     ![233](https://raw.githubusercontent.com/TopuNet/dropDownLoad/master/demo/images/16471b1b26636f263a21115df68cb769.gif)
 ### 下拉加载插件 主要实现下滑翻页的功能 提供一套完整的流程 包括加载动画、插入动画 以及各种状态下的事件处理
 <br />
 <br />
@@ -87,3 +87,6 @@ dropDownLoad.init(opt);
 	2. 增加 animeCssPath 参数 可自定义 css 所在路径
 	3. 修复 totalPage 参数为空时 页数不自增的问题
 	4. 细节上的优化 更加完善的 README
+
+### v1.1.2
+	1. 修复初始内容不够一屏时 加载动画一直显示的问题
diff --git a/demo/jq/dropDownLoad.js b/demo/jq/dropDownLoad.js
@@ -1,7 +1,7 @@
 /*
     Suscc
     20160811
-    下拉加载插件 v1.1.1
+    下拉加载插件 v1.1.2
 */
 /* ----------------------------------------------------------------------------
                                     // --- //
@@ -126,8 +126,13 @@ var dropDownLoad = {
                 this.opt.range = this.loaderHig;
             };
 
+            if (this.mainAllHig - this.mainHig <= 0) {
+                this.loader.hide();
+                return;
+            };
+
             // 判断初始数据是否够一屏 如果够就显示加载动画
-            if (!this.mainAllHig - this.mainHig <= 0 && animate) {
+            if (animate) {
                 style = {
                     '小圈圈': '<div class="loader-inner ball-clip-rotate"><div></div></div>',
                     '金字塔': '<div class="loader-inner triangle-skew-spin"><div></div></div>',

diff --git a/dist/jq/dropDownLoad.js b/dist/jq/dropDownLoad.js
@@ -1,7 +1,7 @@
 /*
     Suscc
     20160811
-    下拉加载插件 v1.1.1
+    下拉加载插件 v1.1.2
 */
 /* ----------------------------------------------------------------------------
                                     // --- //
@@ -126,8 +126,13 @@ var dropDownLoad = {
                 this.opt.range = this.loaderHig;
             };
 
+            if (this.mainAllHig - this.mainHig <= 0) {
+                this.loader.hide();
+                return;
+            };
+
             // 判断初始数据是否够一屏 如果够就显示加载动画
-            if (!this.mainAllHig - this.mainHig <= 0 && animate) {
+            if (animate) {
                 style = {
                     '小圈圈': '<div class="loader-inner ball-clip-rotate"><div></div></div>',
                     '金字塔': '<div class="loader-inner triangle-skew-spin"><div></div></div>',

diff --git a/dist/package.json b/dist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "TopuNet-dropDownLoad",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Topu.net 下拉加载插件",
   "main": "Readme.md",
   "scripts": {