efront 3.14.11 → 3.15.1

package/coms/compile/washcode.js

@@ -173,7 +173,7 @@ function checkRefered(scope) {
             if (right.length) {
                 var key = createExpressKey(right);
                 var iswrite = false;
-                iswrite = !!o.kind || !!e && e.type === STAMP && /=$/.test(e.text);
+                iswrite = !!o.kind || !!e && e.type === STAMP && /(?<![\!\=])\=$/.test(e.text);
                 if (key) map[key] = map[key] | 1 + iswrite;
             }
         }

package/coms/zimoli/color.js

@@ -11,9 +11,10 @@ var rgb4v = function (r, g, b, v) {
 };
 
 
+var number_sort = (a, b) => a - b;
 
 var rgb4h = function (r, g, b, h) {
-	var [p, q, s] = [r, g, b].sort();
+	var [p, q, s] = [r, g, b].sort(number_sort);
 	var m = s - p;
 	h = (h % 360 + 360) % 360;
 	if (h < 60) {

package/coms/zimoli/extendTouchEvent.js

@@ -1,5 +1,5 @@
 function extendTouchEvent(e) {
-    var touch = e.touches[0];
+    var touch = e.changedTouches[0];
     for (var k in touch) {
         if (!(k in e)) e[k] = touch[k];
     }

package/coms/zimoli/menuList.js

@@ -265,7 +265,7 @@ function main(page, items, active, direction = 'y') {
     };
     var open1 = function (event) {
         if (event.which === 3) event.preventDefault();
-        if (istoolbar) open.call(this, event.button ? 20 : 600);
+        if (istoolbar) open.call(this, event.which === 3 ? 20 : 600);
     };
     if (!page.children.length || page.menutype === 1) {
         page.menutype = 1;
@@ -316,7 +316,8 @@ function main(page, items, active, direction = 'y') {
                 a.menu = item;
                 on("mouseleave")(a, cancel);
                 on("mouseenter")(a, open);
-                if (istoolbar) on("mousedown")(a, open1);
+                on("pointermove")(a, open);
+                if (istoolbar) on("pointerdown")(a, open1);
                 on("click")(a, fire);
                 return a;
             });
@@ -347,7 +348,8 @@ function main(page, items, active, direction = 'y') {
             elem.menu = this.src[index];
             on("mouseleave")(elem, cancel);
             on("mouseenter")(elem, open);
-            if (istoolbar) on("mousedown")(elem, open1);
+            on("pointermove")(elem, cancel);
+            if (istoolbar) on("pointerdown")(elem, open1);
             on("click")(elem, fire);
             return elem;
         }, direction);

package/coms/zimoli/moveupon.js

@@ -35,6 +35,7 @@ function moveupon(target, { start, move, end }, initialEvent) {
     };
     var cancel = function (event) {
         if (event.touches && event.touches.length) return;
+        if (event.touches) extendTouchEvent(event);
         removeAllListeners();
         if (isFunction(offmouseup)) offmouseup();
         if (isFunction(offtouchcancel)) offtouchcancel();

package/coms/zimoli/on.js

@@ -330,10 +330,49 @@ if (is_addEventListener_enabled) {
         }, true);
     });
 }
+var invoke = function (event, type, pointerType) {
+    var target = event.target;
+    var touch = event.changedTouches ? event.changedTouches[0] : event;
+    var clickEvent = document.createEvent("MouseEvents");
+    clickEvent.touchend = true;
+    clickEvent.pointerType = pointerType
+    clickEvent.initMouseEvent(type, true, true, window, 1, touch.screenX, touch.screenY, touch.clientX, touch.clientY, false, false, false, false, 0, null);
+    dispatch(target, clickEvent);
+};
 
+(function () {
+    var pointeractive = null;
+    if ("onpointerdown" in window) return;
+    var getPointerType = function (event) {
+        return event.type.replace(/(start|move|end|cancel|down|up|leave|out|over|enter)$/i, '');
+    };
+    var pointerdown = function (event) {
+        if (pointeractive) return;
+        pointeractive = getPointerType(event);
+        invoke(event, 'pointerdown', pointeractive);
+    };
+    var pointerup = function (event) {
+        var pointerType = getPointerType(event);
+        if (!pointeractive || pointerType !== pointeractive) return;
+        invoke(event, 'pointerup', pointerType);
+    };
+    var pointermove = function (event) {
+        var pointerType = getPointerType(event);
+        if (pointeractive && pointerType !== pointeractive) return;
+        invoke(event, 'pointermove', pointerType);
+    };
+    on('mousedown')(window, pointerdown, true);
+    on('mouseup')(window, pointerdown, true);
+    on('touchstart')(window, pointerdown, true);
+    on("touchmove")(window, pointermove, true);
+    on("mousemove")(window, pointermove, true);
+    on("touchend")(window, pointerup, true);
+    on("touchcancel")(window, pointerup, true);
+}());
 
 (function () {
     // fastclick
+    if (window.fastclick) return;
     if (document.efronton) return on = document.efronton;
     document.efronton = on;
     var onclick = on("click");
@@ -371,12 +410,7 @@ if (is_addEventListener_enabled) {
             if (onclick.preventClick) return;
             needFireClick = true;
             touchendFired = true;
-            var target = event.target;
-            var touch = event.changedTouches[0];
-            var clickEvent = document.createEvent("MouseEvents");
-            clickEvent.touchend = true;
-            clickEvent.initMouseEvent("click", true, true, window, 1, touch.screenX, touch.screenY, touch.clientX, touch.clientY, false, false, false, false, 0, null);
-            dispatch(target, clickEvent);
+            invoke(event, 'click');
         }, true);
         window.addEventListener("click", function (event) {
             if (!isClickWithPointer) return;

package/coms/zimoli/picture_.js

@@ -1,7 +1,3 @@
-var mountedPictures = [];
-on("resize")(window, function () {
-    mountedPictures.forEach(a => a.update());
-});
 var getstation = function (n, s) {
     var scale = Math.pow(10, Math.round(Math.log(n) / Math.log(10)));
     var step;
@@ -18,7 +14,7 @@ var trimCoord = move.trimCoord;
 var isequal = (a, b) => a === b || Math.abs((a - b) / (a + b)) < 1e-12;
 function picture_(image = document.createElement("div")) {
     var image_width, image_height;
-    var scaled, x, y, min_scale, loaded_scale, locked_scale, click_scale, loaded_x, loaded_y;
+    var scaled = 1, x = 0, y = 0, min_scale, loaded_scale, locked_scale, click_scale, loaded_x, loaded_y;
     var loaded_width, loaded_height;
     var max_scale = 10 * devicePixelRatio;
     var shape = function () {
@@ -59,13 +55,6 @@ function picture_(image = document.createElement("div")) {
     };
 
     on("append")(image, loadParams);
-
-    on("append")(image, function () {
-        mountedPictures.push(image);
-    });
-    on("remove")(image, function () {
-        removeFromList(mountedPictures, image);
-    });
     image.init = loadParams;
     image.locked = false;
 
@@ -321,8 +310,9 @@ function picture_(image = document.createElement("div")) {
         } else {
             shape();
         }
-
     };
+    bind('resize')(image, image.update);
+
     image.rotateTo = function (deg) {
         rotated = deg;
         this.update();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.14.11",
+    "version": "3.15.1",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {