@dolphinweex/weex-vue-render 0.2.73 → 0.2.74

package/dist/index.common.js

@@ -11009,21 +11009,36 @@ function transitionOnce (vnode, config, callback) {
     var dom = vnode instanceof HTMLElement ? vnode : vnode.$el;
     // trigger image lazyloading by force.
     dom && weex.utils.fireLazyload(dom, true);
-
-    var transitionEndHandler = function (event) {
-      event && event.stopPropagation();
+  
+    var ended = false;
+    var cleanup = function () {
+      if (ended) { return }
+      ended = true;
       if (endEvent) {
         dom.removeEventListener(endEvent, transitionEndHandler);
+      }
+      if (styleName) {
         dom.style[styleName] = '';
       }
+    };
+    var transitionEndHandler = function (event) {
+      event && event.stopPropagation();
+      clearTimeout(timerId);
+      cleanup();
       setTimeout(()=>{
-        callback(); //解决嵌套animation的时候 duration过小时会出现瞬间执行完毕的问题
+        callback && callback(); // 兼容嵌套动画
       })
     };
     if (endEvent) {
       dom.style[styleName] = transitionValue;
-        dom.addEventListener(endEvent, transitionEndHandler);
+      dom.addEventListener(endEvent, transitionEndHandler);
     }
+    var totalMs = (duration + delay) + 60; // 兜底计时器，避免不触发 transitionend 时卡死
+    var timerId = setTimeout(function () {
+      if (ended) { return }
+      cleanup();
+      callback && callback();
+    }, totalMs);
     nextFrame(function () {
       // 修改 transform：translate让它支持传3个参数，且第三个参数无效
       if (config.styles["transform"]) {

package/package.json

@@ -49,5 +49,5 @@
     "type": "git",
     "url": "git+ssh://git@github.com/weexteam/weex-vue-render.git"
   },
-  "version": "0.2.73"
+  "version": "0.2.74"
 }