efront 3.15.2 → 3.16.0

package/coms/zimoli/menu.js

@@ -91,6 +91,28 @@ var getTreeNodes = function (elem) {
     return nodes;
 };
 
+function bindGlobalkey(elem, keymap, emit) {
+    if (elem.keymap) {
+        for (var off of elem.keyoff) {
+            off();
+        }
+    }
+    if (!keymap) return;
+    var keyoff = [];
+    var emitEvent = function (item, event) {
+        event.preventDefault(true);
+        var $scope = {};
+        var { itemName } = this.$src;
+        if (itemName) $scope[itemName] = item;
+        else $scope.menu = item, $scope.$item = item;
+        emit(item, { $scope });
+    }
+    for (let k in keymap) {
+        keyoff.push(bind("keydown." + k)(elem, emitEvent.bind(elem, keymap[k])));
+    }
+    elem.keyoff = keyoff;
+}
+
 function main(elem, mode) {
     if (isElement(elem)) {
         // var os = /Samsung|Firefox|Chrome|MSIE|Safari/i.exec(navigator.userAgent);
@@ -184,6 +206,7 @@ function main(elem, mode) {
                     var src0 = [];
                     menuList(elem, src0, emit, direction);
                     care(elem, function (src) {
+                        bindGlobalkey(elem, src.keymap, emit);
                         src0.splice(0, src0.length);
                         var s = getTreeFromData(src);
                         var i = 0;
@@ -208,6 +231,7 @@ function main(elem, mode) {
     }
     if (!elem.hasAttribute('mode')) elem.setAttribute('mode', mode);
     if (!elem.hasAttribute(mode)) elem.setAttribute(mode, '');
+
     return elem;
 
 }

package/coms/zimoli/menuItem.html

@@ -1,3 +1,6 @@
 <i ng-class="icon" ng-if='useIcon||hasIcon'></i>
-<span ng-html="name"></span>
+<span ng-html="name?"></span>
+<template -if="hotkey?">
+    &nbsp;&nbsp; <span ng-repeat="k of hotkey" class="hotkey" ng-html="k"></span>
+</template>
 <s></s>

package/coms/zimoli/menuItem.js

@@ -11,7 +11,14 @@ function main(elem, scope, hasIcon) {
     var name = scope.name;
     var icon = scope.icon;
     if (hasIcon === undefined) hasIcon = !!icon;
+    if (scope.disabled || scope.enabled === false) {
+        item.setAttribute('disabled', '');
+    }
+    else {
+        item.removeAttribute("disabled");
+    }
     render(item.children, scope, hasIcon instanceof Array ? hasIcon : [{ useIcon: hasIcon, hasIcon, name, icon }]);
     if (scope.line) item.setAttribute("line", ''), on("click")(item, preventDefault);
+    if (scope.hotkey) bindAccesskey(item, scope.hotkey);
     return item;
 }

package/coms/zimoli/menuItem.less

@@ -1,15 +1,36 @@
-i{
+i {
     display: inline-block;
     width: 1em;
 }
+
+.hotkey {
+    margin-left: 12px;
+    font-size: 12px;
+    float: right;
+}
+
+&[disabled] {
+    background: #0000;
+
+    &>.track {
+        opacity: 0;
+    }
+
+    border-radius: 0;
+    color: #999;
+}
+
 &.line,
 &[line] {
     box-shadow: none;
-    >.track{
+
+    >.track {
         display: none;
     }
+
     line-height: 0;
     font-size: 0;
+
     &:after {
         content: "";
         display: block;

package/coms/zimoli/menuList.js

@@ -14,6 +14,7 @@ var unfocus = function () {
     this.setFocus(null);
 };
 var setFocus = function (focused) {
+    if (focused && focused.hasAttribute("disabled")) return;
     var page = this;
     if (focused) {
         if (page.focused !== focused) {
@@ -40,16 +41,17 @@ var moveFocus = function (delta) {
     else {
         var newIndex = focused.index + delta;
         var total = page.total;
-        if (page !== root_menu) {
-            total++;
-        }
         if (newIndex < 0) newIndex = total + newIndex;
         if (newIndex > total - 1) newIndex = newIndex - total;
     }
-
-    var e = page.getIndexedElement(newIndex);
+    do {
+        var e = page.getIndexedElement(newIndex);
+        if (newIndex < 0) newIndex = total + newIndex;
+        newIndex += delta;
+    } while (e && (e.hasAttribute("disabled") || e.hasAttribute("line")));
     if (!e) page.setFocus(null);
-    else page.open(e);
+    else if (page.ispop !== true) page.setFocus(e), page.open(e);
+    else page.setFocus(e);
 };
 var openFocus = function () {
     var menu = mounted_menus[mounted_menus.length - 1] || root_menu;
@@ -68,15 +70,20 @@ var keyAction = function (deltax, deltay) {
 
     if (menu.direction === 'y') {
         if (deltax === 1) {
-            if (menu.focused) openFocus();
+            // right
+            if (menu.focused) var fmenu = menu.focused.menu;
+            if (fmenu && fmenu.children && fmenu.children.length) {
+                openFocus();
+            }
             else if (parent && parent.direction !== 'y') {
                 parent.moveFocus(deltax);
             }
         }
         else if (deltax === -1) {
+            // left
             if (parent) {
                 if (parent.direction === 'y') remove(mounted_menus.pop());
-                else if (!menu.focused) parent.moveFocus(deltax);
+                else parent.moveFocus(deltax);
             }
         }
         else {
@@ -85,15 +92,18 @@ var keyAction = function (deltax, deltay) {
     }
     else {
         if (deltay === 1) {
-            if (menu.focused) openFocus();
+            // down
+            if (menu.focused) var fmenu = menu.focused.menu;
+            if (fmenu && fmenu.children && fmenu.children.length) openFocus();
             else if (parent && parent.direction === 'y') {
                 parent.moveFocus(deltay);
             }
         }
         else if (deltay === -1) {
+            // up
             if (parent) {
                 if (parent.direction !== 'y') remove(mounted_menus.pop());
-                else if (!menu.focused) parent.moveFocus(deltay);
+                else parent.moveFocus(deltay);
             }
         }
         else {
@@ -178,11 +188,8 @@ function main(page, items, active, direction = 'y') {
         page.actived = menu;
         menu.root = page.root || page;
         popup(menu, target);
+        menu.setFocus(menu.firstMenu);
         if (page.ispop === true) {
-            var offleave0 = on("mouseleave")(target, release);
-            var offleave1 = on("mouseleave")(menu, release);
-            var offenter0 = on("mouseenter")(target, clear);
-            var offenter1 = on("mouseenter")(menu, clear);
         } else {
             page.ispop = 1;
             page.tabIndex = 0;
@@ -191,10 +198,6 @@ function main(page, items, active, direction = 'y') {
         on("mousedown")(menu, e => e.preventDefault());
         once("remove")(menu, function () {
             removeFromList(mounted_menus, this);
-            if (offleave0) offleave0();
-            if (offleave1) offleave1();
-            if (offenter0) offenter0();
-            if (offenter1) offenter1();
         });
     }
     on("blur")(page, unfocus);
@@ -220,12 +223,14 @@ function main(page, items, active, direction = 'y') {
         }, time || 60);
     };
     var cancel = function () {
+        clear();
         clearTimeout(popTimer);
     }
     var fire = function () {
         cancel();
         if (this.menu.line) return;
         if (byMousedown) return;
+        if (this.hasAttribute("disabled") || this.hasAttribute('line')) return;
         var pop = active(this.menu, this);
         if (pop === false) return;
         var root = page.root || page;
@@ -285,6 +290,7 @@ function main(page, items, active, direction = 'y') {
                 );
                 if (!page.firstMenu) {
                     page.firstMenu = a;
+                    page.total = items.length;
                 }
                 a.menu = s.menu;
                 return a;

package/coms/zimoli/moveupon.js

@@ -3,13 +3,15 @@ function mousemove(event) {
     moveListeners.forEach(a => a(event));
 }
 function addHookListener(on, hook, isroot) {
-    var index = moveListeners.indexOf(hook);
-    if (~index) {
-        moveListeners.splice(index, 1);
-    }
     if (!moveListeners.length) {
         offhook = on(window, mousemove);
     }
+    else {
+        var index = moveListeners.indexOf(hook);
+        if (~index) {
+            moveListeners.splice(index, 1);
+        }
+    }
     if (isroot) {
         moveListeners.unshift(hook);
     } else {

package/coms/zimoli/on.js

@@ -1,4 +1,5 @@
 "use strict";
+if (document.efronton) return document.efronton;
 var is_addEventListener_enabled = "addEventListener" in window;
 var handlersMap = {};
 var changes_key = 'changes';
@@ -6,8 +7,10 @@ var eventtypereg = /(?:\.once|\.prevent|\.stop|\.capture|\.self|\.passive|\.[a-z
 var keyCodeMap = {
     backspace: 8,
     tab: 9,
+    "⇄": 9,
     ceter: 12,// num5 when numlock is off.
     enter: 13,
+    "↵": 13,
     shift: 16,
     ctrl: 17,
     control: 17,
@@ -23,11 +26,17 @@ var keyCodeMap = {
     end: 35,
     home: 36,
     left: 37,
+    "←": 37,
     up: 38,
+    "↑": 38,
     right: 39,
+    "→": 39,
     down: 40,
+    "↓": 40,
     insert: 45,
+    "ins": 45,
     delete: 46,
+    del: 46,
     key0: 47,
     key1: 48,
     key2: 49,
@@ -54,10 +63,14 @@ var keyCodeMap = {
     num8: 104,
     num9: 105,
     times: 106,
+    "⨉": 106,
     numplus: 107,
     numminus: 109,
     dot: 110,
-    divid: 111,
+    numdot: 110,
+    divide: 111,
+    div: 111,
+    "/": 111,
     f1: 112,
     f2: 113,
     f3: 114,
@@ -74,17 +87,39 @@ var keyCodeMap = {
     numlock: 144,
     scrolllock: 145,
     semicolon: 186,
+    ";": 186,
+    ":": 186,
     equal: 187,
+    "=": 187,
     plus: 187,
+    "+": 187,
     comma: 188,
+    ",": 188,
+    "<": 188,
     minus: 189,
+    "-": 189,
+    "_": 189,
     period: 190,
+    ".": 110,
+    ">": 110,
     slash: 191,
+    "/": 191,
+    ">": 191,
     backquote: 192,
+    "`": 192,
+    "~": 192,
     bracketleft: 219,
+    "[": 219,
+    "{": 219,
     backslash: 220,
+    "\\": 220,
+    "|": 220,
     bracketright: 221,
+    "]": 221,
+    "}": 221,
     quote: 222,
+    "'": 222,
+    "\"": 222,
     bright: 255,
 };
 var parseEventTypes = function (eventtypes) {
@@ -156,180 +191,158 @@ function checkKeyNeed(eventtypes, e) {
     return true;
 }
 var pendingid = 0;
-function wrapHandler(h) {
+function pending(h, event) {
     if (h instanceof Function) {
-        return function () {
-            var res = h.apply(this, arguments);
-            if (res && isFunction(res.then)) {
-                var id = ++pendingid & 0x1fffffffffffff;
-                this.setAttribute('pending', id);
-                var removePending = () => {
-                    if (+this.getAttribute('pending') === id) this.removeAttribute('pending');
-                };
-                res.then(removePending, removePending);
-            }
-            return res;
+        var res = h.call(this, event);
+        if (res && isFunction(res.then) && this.setAttribute) {
+            var id = ++pendingid & 0x1fffffffffffff;
+            this.setAttribute('pending', id);
+            var removePending = () => {
+                if (+this.getAttribute('pending') === id) this.removeAttribute('pending');
+            };
+            res.then(removePending, removePending);
         }
+        return res;
     }
     return h;
 }
-if (is_addEventListener_enabled) {
-    var on = function (k) {
-        var on_event_path = "on" + k;
-        if (handlersMap[on_event_path]) return handlersMap[on_event_path];
-        var eventtypes = parseEventTypes(k);
-        k = k.replace(eventtypereg, '');
-        function addhandler(element, handler, firstmost) {
-            var target = this;
-            handler = wrapHandler(handler);
-            if (eventtypes.capture) firstmost = true;
-            if (target && element !== target) {
-                handler = handler.bind(element);
-                element = target;
+var remove = function (k, hk, [eventtypes, handler, context]) {
+    var element = this;
+    var hs = element[hk];
+    if (hs) {
+        for (var cx = hs.length - 1; cx >= 0; cx--) {
+            var [e, h, c] = hs[cx];
+            if (h === handler && e === eventtypes && c === context) {
+                hs.splice(cx, 1);
+                if (k === changes_key) element.needchanges--;
             }
-            if (k === changes_key) {
-                if (!element.needchanges) element.needchanges = 0;
-                element.needchanges++;
+        }
+        if (!hs.length && hs.h) {
+            element[hk] = null;
+            if (is_addEventListener_enabled) {
+                element.removeEventListener(k, hs.h, /1$/.test(hk));
+            } else {
+                if (element["on" + k] === hs.h) element["on" + k] = null;
             }
-            var h = function (e) {
-                if (eventtypes.self && e.target !== this) return;
-                if (!checkKeyNeed(eventtypes, e)) return;
-                if (eventtypes.stop) e.stopPropagation();
-                if (eventtypes.passive) e.preventDefault = function () { };
-                if (eventtypes.prevent) e.preventDefault();
-                if (handler instanceof Array) {
-                    handler.forEach(function (h) {
-                        h.call(this, e);
-                    }, this);
-                } else {
-                    handler.call(this, e);
-                }
-                if (eventtypes.once) remove();
-            };
-            var remove = function () {
-                if (k === changes_key) element.needchanges--;
-                element.removeEventListener(k, h, firstmost);
-            };
-            element.addEventListener(k, h, firstmost);
-            return remove;
         }
-        return handlersMap[on_event_path] = addhandler;
-    };
-} else {
-    var on = function on(k) {
-        var handler_path = k + "handlers";
-        var on_event_path = "on" + k;
+    }
+};
+var broadcast = function (k, hk, event) {
+    var element = this;
+    var handlers = element[hk];
+    if (handlers.length > 1) handlers = handlers.slice();
+    for (var [eventtypes, handler, context] of handlers) {
+        if (eventtypes.self && event.target !== element) continue;
+        if (!checkKeyNeed(eventtypes, event)) continue;
+        if (eventtypes.stop) event.stopPropagation();
+        if (eventtypes.passive) event.preventDefault = function () { };
+        if (eventtypes.prevent) event.preventDefault();
+        if (handler instanceof Array) {
+            for (var h of handler) {
+                h.call(context, event);
+            }
+        } else {
+            pending.call(context, handler, event);
+        }
+        if (eventtypes.once) remove.call(element, k, hk, eventtypes, handler);
+    }
+};
 
-        var eventtypes = parseEventTypes(k);
-        k = k.replace(eventtypereg, '');
+var checkroot = function (element, k) {
+    k = "on" + k;
+    if (!(k in element)) {
+        if (element === window && k in document) {
+            element = document;
+            if (!checkroot[k]) checkroot[k] = true, console.warn("use ", k, "on document instead of on window");
+        }
+    }
+    return element;
+}
 
-        if (handlersMap[on_event_path]) return handlersMap[on_event_path];
-        function addhandler(element, handler, firstmost = false) {
-            var target = this;
-            handler = wrapHandler(handler);
-            if (eventtypes.capture) {
-                console.warn("当前运行环境不支持事件capture");
-                firstmost = true;
-            }
-            if (target && element !== target) {
-                handler = handler.bind(element);
-                element = target;
-            }
-            if (k === changes_key) {
-                if (!element.needchanges) element.needchanges = 0;
-                element.needchanges++;
-            }
-            // 仅在hack事件中使用firstmost参数
-            if (!(on_event_path in element)) {
-                if (element === window && on_event_path in document) {
-                    element = document;
-                    if (!addhandler.logged) addhandler.logged = true, console.warn("use", on_event_path, "on document instead of on window");
-                }
-            }
-            if (element[handler_path] instanceof Array) {
-                if (~element[handler_path].indexOf(handler)) return;
-                if (firstmost) element[handler_path].unshift(handler);
-                else element[handler_path].push(handler);
-            } else {
-                element[handler_path] = element[on_event_path] && element[on_event_path] !== handler ? [element[on_event_path], handler] : [handler];
-                element[on_event_path] = function (e) {
-                    if (!e) e = window.event || {};
-                    if (!e.target && e.srcElement) {
-                        e.target = e.srcElement;
-                    }
-                    if (eventtypes.self && e.target !== this) return;
-                    if (!checkKeyNeed(eventtypes, e)) return;
-                    if (e.stopedPropagation) return;
-                    if (!e.stopPropagation) {
-                        e.stopPropagation = function () {
-                            this.stopedPropagation = true;
-                        };
-                    }
-                    if (eventtypes.stop) {
-                        e.stopPropagation();
-                    }
-                    if (!e.preventDefault) {
-                        e.preventDefault = function () {
-                            e.returnValue = false;
-                        };
-                    }
-                    if (e.button) {
-                        if (e.buttons === undefined) e.buttons = e.button;
-                        if (e.which === undefined) e.which = e.button + 1;
-                    }
-                    if (e.keyCode) {
-                        if (e.which === undefined) e.which = e.keyCode;
-                    }
-                    if (eventtypes.passive) {
-                        e.preventDefault = function () { };
-                    }
-                    if (eventtypes.prevent) {
-                        e.preventDefault();
-                    }
+var append = function (k, hk, listener2, firstmost) {
+    var [eventtypes, handler, context] = listener2;
+    var element = this;
+    var handlers = element[hk];
+    for (var [h, e, c] of handlers) {
+        if (h === handler && eventtypes === e && c === context) return;
+    }
+    if (k === changes_key) {
+        if (!element.needchanges) element.needchanges = 0;
+        element.needchanges++;
+    }
+    if (firstmost) handlers.unshift(listener2);
+    else handlers.push(listener2);
+};
 
-                    broadcast(element[handler_path], e);
-                    if (eventtypes.once) {
-                        remove();
-                    }
-                };
-                var broadcast = function (handlers, e) {
-                    for (var cx = 0, dx = handlers.length; cx < dx; cx++) {
-                        var _handler = handlers[handlers.length + cx - dx];
-                        if (_handler instanceof Function) {
-                            _handler.call(element, e);
-                        } else if (_handler instanceof Array) {
-                            broadcast(_handler, e);
-                        }
-                    }
-                };
-            }
-            var remove = function () {
-                if (k === changes_key) element.needchanges--;
-                var handlers = element[handler_path];
-                for (var cx = handlers.length - 1; cx >= 0; cx--) {
-                    if (handlers[cx] === handler) {
-                        handlers.splice(cx, 1);
-                    }
+var on = document.efronton = function (k) {
+    var on_event_path = "on" + k;
+    if (handlersMap[on_event_path]) return handlersMap[on_event_path];
+    var eventtypes = parseEventTypes(k);
+    k = k.replace(eventtypereg, '');
+    var handler_path = k + "handlers";
+    var hk = handler_path + +!!eventtypes.capture;
+    if (is_addEventListener_enabled) var addhandler = function (context, handler, firstmost = false) {
+        var target = this || context;
+        target = checkroot(target, k);
+        if (target[hk] instanceof Array) {
+        } else {
+            var h = broadcast.bind(target, k, hk);
+            target[hk] = [];
+            target[hk].h = h;
+            target.addEventListener(k, h, eventtypes.capture);
+        }
+        var listener = [eventtypes, handler, context];
+        append.call(target, k, hk, listener, firstmost);
+        return remove.bind(target, k, hk, listener);
+    };
+
+    else var addhandler = function (context, handler, firstmost = false) {
+        var target = this || context;
+        if (eventtypes.capture) {
+            console.warn("当前运行环境不支持事件capture");
+            firstmost = true;
+        }
+        target = checkroot(target, k);
+        if (target[handler_path] instanceof Array) {
+        } else {
+            var h = function (e) {
+                if (!e) e = window.event || {};
+                if (!e.target && e.srcElement) {
+                    e.target = e.srcElement;
+                }
+                if (e.stopedPropagation) return;
+                if (!e.stopPropagation) {
+                    e.stopPropagation = function () {
+                        this.stopedPropagation = true;
+                    };
+                }
+                if (!e.preventDefault) {
+                    e.preventDefault = function () {
+                        e.returnValue = false;
+                        e.defaultPrevented = true;
+                    };
                 }
-                if (!handlers.length) {
-                    element[handler_path] = null;
-                    element[on_event_path] = null;
+                if (e.button) {
+                    if (e.buttons === undefined) e.buttons = e.button;
+                    if (e.which === undefined) e.which = e.button + 1;
                 }
+                if (e.keyCode) {
+                    if (e.which === undefined) e.which = e.keyCode;
+                }
+                broadcast.call(target, k, handler_path, e);
+                return e.returnValue;
             };
-            return remove;
+            target[handler_path] = target["on" + k] && target["on" + k] !== handler ? [[{}, target["on" + k]]] : [];
+            target[handler_path].h = h;
+            target["on" + k] = h;
         }
-        return handlersMap[on_event_path] = addhandler;
+        var listener = [eventtypes, handler, context];
+        append.call(target, k, handler_path, listener, firstmost);
+        return remove.bind(target, k, handler_path, listener);
     };
-    if (!("onmousedown" in window)) on("mousedown")(document, function () {
-        var cancelup = on("mouseup")(document, function () {
-            cancelmove();
-            cancelup();
-        }, true);
-        var cancelmove = on("mousemove")(document, function (event) {
-            if (!event.which) dispatch("mouseup", document)/* ,console.warn("dispatch mouseup nanually.")*/;
-        }, true);
-    });
-}
+    handlersMap[on_event_path] = addhandler;
+    return addhandler;
+};
 var invoke = function (event, type, pointerType) {
     var target = event.target;
     var touch = event.changedTouches ? event.changedTouches[0] : event;
@@ -342,7 +355,7 @@ var invoke = function (event, type, pointerType) {
 
 (function () {
     var pointeractive = null;
-    if ("onpointerdown" in window) return;
+    if ("onpointerdown" in window || document.efronton) return;
     var getPointerType = function (event) {
         return event.type.replace(/(start|move|end|cancel|down|up|leave|out|over|enter)$/i, '');
     };
@@ -373,8 +386,6 @@ var invoke = function (event, type, pointerType) {
 (function () {
     // fastclick
     if (window.fastclick) return;
-    if (document.efronton) return on = document.efronton;
-    document.efronton = on;
     var onclick = on("click");
     var onmousedown = on("mousedown");
     var onmousemove = on("mousemove");