From 109465d3c51ad9e58a5a5351b4031ac6b73b6de0 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Mon, 16 Oct 2017 20:10:21 +0800
Subject: [PATCH] optimize  Scroll scroll behavior

---
 examples/routers/scroll.vue      |  2 +-
 src/components/scroll/scroll.vue | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/examples/routers/scroll.vue b/examples/routers/scroll.vue
index 5e449d8..fbfaccd 100644
--- a/examples/routers/scroll.vue
+++ b/examples/routers/scroll.vue
@@ -1,5 +1,5 @@
 <template>
-    <Scroll :on-reach-edge="loadData" loading-text="L-o-a-d-i-n-g...">
+    <Scroll :on-reach-top="loadData" loading-text="L-o-a-d-i-n-g...">
         <section v-for="item in list">
             <div class="city">
                 <p>{{ item }}</p>
diff --git a/src/components/scroll/scroll.vue b/src/components/scroll/scroll.vue
index a16d365..2a75458 100644
--- a/src/components/scroll/scroll.vue
+++ b/src/components/scroll/scroll.vue
@@ -31,6 +31,8 @@
         minimumStartDragOffset: 5, // minimum start drag offset
     };
 
+    const noop = () => Promise.resolve();
+
     export default {
         name: 'Scroll',
         mixins: [],
@@ -41,16 +43,13 @@
                 default: 300
             },
             onReachTop: {
-                type: Function,
-                default: () => Promise.resolve()
+                type: Function
             },
             onReachBottom: {
-                type: Function,
-                default: () => Promise.resolve()
+                type: Function
             },
             onReachEdge: {
-                type: Function,
-                default: () => Promise.resolve()
+                type: Function
             },
             loadingText: {
                 type: String,
@@ -134,8 +133,8 @@
                     }
                 }
 
-                const callbacks = [this.waitOneSecond(), this.onReachEdge(dir)];
-                callbacks.push(dir > 0 ? this.onReachTop() : this.onReachBottom());
+                const callbacks = [this.waitOneSecond(), this.onReachEdge ? this.onReachEdge(dir) : noop()];
+                callbacks.push(dir > 0 ? this.onReachTop ? this.onReachTop() : noop() : this.onReachBottom ? this.onReachBottom() : noop());
 
                 let tooSlow = setTimeout(() => {
                     this.reset();
@@ -183,6 +182,15 @@
             stretchEdge(direction) {
                 clearTimeout(this.rubberRollBackTimeout);
 
+                // check if set these props
+                if (!this.onReachEdge) {
+                    if (direction > 0) {
+                        if (!this.onReachTop) return;
+                    } else {
+                        if (!this.onReachBottom) return;
+                    }
+                }
+
                 // if the scroll is not strong enough, lets reset it
                 this.rubberRollBackTimeout = setTimeout(() => {
                     if (!this.isLoading) this.reset();
--
libgit2 0.21.4