efront 3.35.8 → 3.35.9

package/coms/basic/sortname.js

@@ -85,8 +85,8 @@ var parse干支 = function (a) {
 };
 var compare = function (a, b) {
     for (var cx1 = a.length - 1, cx2 = b.length - 1; cx1 >= 0 && cx2 >= 0; cx1--, cx2--) {
-        while (/\s\u00a0/.test(a[cx1])) cx1--;
-        while (/\s\u00a0/.test(b[cx2])) cx2--;
+        while (/[\s\u00a0]/.test(a[cx1])) cx1--;
+        while (/[\s\u00a0]/.test(b[cx2])) cx2--;
         if (a[cx1] !== b[cx2] || a[cx1] in map子丑寅 || a[cx1] in map上中下 || a[cx1] in map一二三 || a in power || /^\d$/.test(a[cx1])) break;
     }
     a = a.slice(0, cx1 + 1);

package/coms/zimoli/bindtouch.js

@@ -43,8 +43,10 @@ function bindtouch(target, bindder, lockDirection = false) {
             var pos = move.call(this, null, event);
             if (isObject(pos)) {
                 var { x = 0, y = 0 } = pos;
-                if (isFunction(move)) {
-                    var { x: x1, y: y1 } = move.call(this, { x: x + deltax, y: y + deltay, deltax, deltay }, event);
+                a: if (isFunction(move)) {
+                    pos = move.call(this, { x: x + deltax, y: y + deltay, deltax, deltay }, event);
+                    if (!pos) break a;
+                    var { x: x1, y: y1 } = pos;
                     if (x1 !== x) saved_x += x1 - x;
                     if (y1 !== y) saved_y += y1 - y;
                 }

package/coms/zimoli/on.js

@@ -459,37 +459,35 @@ var invoke = function (event, type, pointerType) {
     var onclick = on("click");
     var onmousedown = on("mousedown");
     var onmousemove = on("mousemove");
-    var mouse_x, mouse_y, lasttime_click;
+    var pointerX, pointerY, lasttime_click;
     var needFireClick = false;
     var isClickWithPointer = false;
     var touchendFired = false;
-    function clickstart() {
+    function clickstart(event) {
         needFireClick = true;
         touchendFired = false;
         isClickWithPointer = true;
         onclick.preventClick = false;
+        pointerX = event.clientX, pointerY = event.clientY;
     }
     var abs = Math.abs;
-    function clickcancel() {
-        onclick.preventClick = true;
+    function clickcancel(event) {
+        if (!event || abs(event.clientX - pointerX) >= MOVELOCK_DELTA || abs(event.clientY - pointerY) >= MOVELOCK_DELTA) onclick.preventClick = true;
     }
-    onmousedown(window, function (event) {
-        lasttime_click = event.timeStamp;
-        mouse_x = event.clientX, mouse_y = event.clientY;
-        clickstart.call(this, event);
-    });
+    onmousedown(window, clickstart);
 
-    onmousemove(window, function (event) {
-        if (abs(event.clientX - mouse_x) >= MOVELOCK_DELTA || abs(event.clientY - mouse_y) >= MOVELOCK_DELTA)
-            clickcancel.call(this, event);
-    });
+    onmousemove(window, clickcancel);
     if (window.addEventListener) {
-        window.addEventListener("touchmove", clickcancel, true);
+        window.addEventListener("touchmove", function (event) {
+            extendTouchEvent(event);
+            clickcancel.call(this, event);
+        }, true);
         window.addEventListener("touchstart", function (event) {
             if (event.touches.length > 1) {
                 clickcancel();
                 return;
             }
+            extendTouchEvent(event);
             clickstart.call(this, event);
         }, true);
         window.addEventListener("touchend", function (event) {

package/coms/zimoli/zimoli.js

@@ -492,7 +492,7 @@ try {
 } catch (e) {
 }
 var root_path;
-var pushstate = function (path_name, history_name, oldpagepath) {
+var pushstate = function (path_name, history_name) {
     var isDestroy = false;
     if (history_name === undefined) {
         history_name = current_history;
@@ -502,10 +502,6 @@ var pushstate = function (path_name, history_name, oldpagepath) {
         history[history_name] = [path_name];
     } else {
         var _history = history[history_name];
-        if (oldpagepath && [].indexOf.call(_history, oldpagepath, 0) < 0) {
-            _history.splice(root_path === _history[0], _history.length);
-            isDestroy = true;
-        }
         for (var cx = 0, dx = _history.length; cx < dx; cx++) {
             if (_history[cx] === path_name) {
                 _history.splice(cx, dx - cx);
@@ -746,7 +742,7 @@ zimoli.enableTouchBack = function () {
         end() {
             if (ratio === null || !touchTarget) return;
             if (deltaX > 0 && ratio > .1 || deltaX < 0 && ratio > .9 || deltaX === 0 && ratio > .4) {
-                pushstate(historyList[historyList.length - 2]);
+                pushstate(historyList[historyList.length - 2], history_name);
                 remove(currentTarget);
                 transition(touchTarget, 1);
                 global[history_name] = touchTarget;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.35.8",
+    "version": "3.35.9",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {