fix issue #208

ustbhuangyi · Sep 11, 2017 · 237cd8c · 237cd8c
1 parent 04c3a30
commit 237cd8c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/example/components/full-page-slide/full-page-slide.vue b/example/components/full-page-slide/full-page-slide.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="items.length" class="full-page-slide-wrapper">
-    <slide ref="slide" :autoPlay="false" :loop="false" :allowVerticalScroll="false">
+    <slide ref="slide" :autoPlay="false" :loop="false">
       <div v-for="(item, index) in items">
         <div class="full-page-img-wrapper" :style="getStyle(index)">
           <div v-if="index === items.length -1" class="button-wrapper" @click="handleClick()">

diff --git a/example/components/slide/slide.vue b/example/components/slide/slide.vue
@@ -38,10 +38,6 @@
       click: {
         type: Boolean,
         default: true
-      },
-      allowVerticalScroll: {
-        ype: Boolean,
-        default: true
       }
     },
     data() {
@@ -134,7 +130,6 @@
       _initSlide() {
         this.slide = new BScroll(this.$refs.slide, {
           scrollX: true,
-          eventPassthrough: this.allowVerticalScroll ? 'vertical' : false,
           momentum: false,
           snap: {
             loop: this.loop,

diff --git a/src/scroll/init.js b/src/scroll/init.js
@@ -57,9 +57,11 @@ const DEFAULT_OPTIONS = {
    * for slide
    * snap: {
    *   loop: false,
+   *   el: domEl,
    *   threshold: 0.1,
    *   stepX: 100,
-   *   stepY: 100
+   *   stepY: 100,
+   *   listenFlick: true
    * }
    */
   snap: false,

diff --git a/src/scroll/snap.js b/src/scroll/snap.js
@@ -124,19 +124,21 @@ export function snapMixin(BScroll) {
       }
     })
 
-    this.on('flick', () => {
-      let time = snap.speed || Math.max(
-          Math.max(
-            Math.min(Math.abs(this.x - this.startX), 1000),
-            Math.min(Math.abs(this.y - this.startY), 1000)
-          ), 300)
-
-      this.goToPage(
-        this.currentPage.pageX + this.directionX,
-        this.currentPage.pageY + this.directionY,
-        time
-      )
-    })
+    if (snap.listenFlick !== false) {
+      this.on('flick', () => {
+        let time = snap.speed || Math.max(
+            Math.max(
+              Math.min(Math.abs(this.x - this.startX), 1000),
+              Math.min(Math.abs(this.y - this.startY), 1000)
+            ), 300)
+
+        this.goToPage(
+          this.currentPage.pageX + this.directionX,
+          this.currentPage.pageY + this.directionY,
+          time
+        )
+      })
+    }
   }
 
   BScroll.prototype._nearestSnap = function (x, y) {