@dolphinweex/weex-vue-render 0.2.111 → 0.2.113

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.
@@ -4132,7 +4132,6 @@ function initEnv (viewportInfo, envInfo) {
4132
4132
  deviceModel: device_display.deviceModel || "",
4133
4133
  appEnv: device_display.appEnv,
4134
4134
  versionCode: device_display.versionCode,
4135
- colmoVersion: device_display.colmoVersion,
4136
4135
  idfa: device_display.idfa,
4137
4136
  isFullScreen: device_display.isFullScreen,
4138
4137
  weexVersion: device_display.weexVersion,
@@ -4141,8 +4140,10 @@ function initEnv (viewportInfo, envInfo) {
4141
4140
  navigationBarHeight: device_display.navigationBarHeight,
4142
4141
  safeAreaBottomHeight: device_display.safeAreaBottomHeight,
4143
4142
  isImmersion: device_display.isImmersion ? "true" : "false",
4144
-
4145
4143
  };
4144
+ if(device_display.colmoVersion){
4145
+ env.colmoVersion = device_display.colmoVersion
4146
+ }
4146
4147
  /**
4147
4148
  * viewportInfo: scale, deviceWidth, deviceHeight. dpr
4148
4149
  */
@@ -8911,6 +8912,9 @@ var slideMixin = {
8911
8912
  return
8912
8913
  }
8913
8914
  }
8915
+ if (weex.sliderChange) {
8916
+ return
8917
+ }
8914
8918
  if (!this.scrollable || this.frameCount<=1) {
8915
8919
  __renderLog('[weex-slider] _handleTouchStart return: not scrollable', {
8916
8920
  scrollable: this.scrollable,
@@ -8977,6 +8981,13 @@ var slideMixin = {
8977
8981
  }
8978
8982
  },
8979
8983
  _handleTouchMove: function _handleTouchMove (event) {
8984
+ if (weex.sliderChange) {
8985
+ // 手势中途被打断时清掉起点,避免 flag 恢复后按旧 startX 改 left
8986
+ if (this._touchParams) {
8987
+ delete this._touchParams
8988
+ }
8989
+ return
8990
+ }
8980
8991
  var tp = this._touchParams;
8981
8992
  if (!tp || !this.scrollable || this.frameCount<=1 || this._sliding) {
8982
8993
  if (this._sliding) {
@@ -11552,7 +11563,8 @@ var dom = {
11552
11563
  function recalc (rect) {
11553
11564
  var res = {};
11554
11565
  rectKeys.forEach(function (key) {
11555
- if (rect[key]) {
11566
+ // left/top 为 0 时也要保留,通栏区域 left=0 不能被当成空值丢掉
11567
+ if (rect[key] != null) {
11556
11568
  res[key] = rect[key] / scale;
11557
11569
  }
11558
11570
  });
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.111"
52
+ "version": "0.2.113"
53
53
  }