@dolphinweex/weex-vue-render 0.2.16 → 0.2.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -8034,6 +8034,11 @@ var slideMixin = {
8034
8034
  var tp = this._touchParams;
8035
8035
  if (!tp) { return }
8036
8036
 
8037
+ // 如果子view已经处在swipe事件中,并切不允许事件冒泡则不处理当前的事件
8038
+ if (weex.gestureAleadyHandleSwipeOnce && !weex.gestureHandleSwipeCanPropagation) {
8039
+ return;
8040
+ }
8041
+
8037
8042
  var ref = this._touchParams;
8038
8043
  var startX = ref.startX;
8039
8044
  var startY = ref.startY;
@@ -8071,6 +8076,17 @@ var slideMixin = {
8071
8076
 
8072
8077
  touchSliderInstance = inner;
8073
8078
 
8079
+ if (!this.autoPlay) {
8080
+ // 如果不是自动播放,则当滚动到最后一页时,offsetX不能 < 0
8081
+ // 如果不是自动播放,则当滚动到第一页时,offsetX不能 > 0
8082
+ if (this._preIndex == this.frameCount - 1) {
8083
+ offsetX = Math.max(offsetX, 0)
8084
+ }
8085
+ if (this._preIndex == 0) {
8086
+ offsetX = Math.min(offsetX, 0)
8087
+ }
8088
+ }
8089
+
8074
8090
  if (inner && offsetX) {
8075
8091
  if (!this._nodesOffsetCleared) {
8076
8092
  this._nodesOffsetCleared = true;
package/package.json CHANGED
@@ -49,5 +49,5 @@
49
49
  "type": "git",
50
50
  "url": "git+ssh://git@github.com/weexteam/weex-vue-render.git"
51
51
  },
52
- "version": "0.2.16"
52
+ "version": "0.2.18"
53
53
  }