efront 3.22.3 → 3.22.6

package/apps/pivot/auth/login.html

@@ -6,4 +6,7 @@
 </div>
 <div foot>
     <button pending.="pending" type="submit">登录</button>
+</div>
+<div message>
+    登录之前需要使用&nbsp;<b>efront password</b>&nbsp;命令在服务器上设置密码
 </div>

package/apps/pivot/auth/login.js

@@ -9,7 +9,7 @@ function main(host) {
     page.innerHTML = login;
     drag.on(page);
     fields[0].readonly = !!host;
-    on("append")(page, function () {
+    on("mounted")(page, function () {
         move.bindPosition(page, [.5, .5]);
     });
     renderWithDefaults(page, {

package/apps/pivot/auth/login.less

@@ -4,11 +4,24 @@
 
 [foot],
 [head] {
-    &::before{
+    &::before {
         display: none;
     }
+
     text-align: center;
 }
-.button{
-    padding: 0px 40px;
+
+[message] {
+    padding: 2px 4px;
+    line-height: 1.2;
+    text-align: center;
+    color: #29c;
+    border-top: 1px solid #29c;
+    background: #29c1;
+    margin: 0 auto;
+    font-size: 12px;
 }
+
+.button {
+    padding: 0px 40px;
+}

package/apps/pivot/log/boot.js

@@ -5,10 +5,11 @@ var fields = refilm`
         var ip = e.data[e.field.key];
         var m = /(\d+\.){3}\d+$/.exec(ip);
         if (m) {
+            var l = document.createElement('label');
+            appendChild(e, l);
+            l.innerHTML = ' ';
             var setAddress = function (a) {
-                var l = document.createElement('label');
                 l.innerText = a;
-                appendChild(e, l);
             };
             if (e.data.address) setAddress(e.data.address);
             else e.data.address = data.from("iplocation", { ip: m[0] }, function (a) {

package/coms/kugou/dragview.js

@@ -12,7 +12,7 @@ var dragview = function (event) {
             var deltaY = savedY - event.clientY;
 
             if (!moving) {
-                if (Math.abs(deltaX) < MOVELOCK_DELTA && Math.abs(deltaY) < MOVELOCK_DELTA) return;
+                if (!onclick.preventClick) return;
                 if (deltaX > 0 && !freeOffset(page.style.left || 0) || Math.abs(deltaY) >= Math.abs(deltaX)) {
                     moving = -1;
                 } else {

package/coms/layer/glance.js

@@ -40,7 +40,7 @@ var dragview = function (dragview) {
             var deltaY = savedY - event.clientY;
             event.preventDefault();
             if (!moving) {
-                if (Math.abs(deltaX) < MOVELOCK_DELTA && Math.abs(deltaY) < MOVELOCK_DELTA) return;
+                if (!onclick.preventClick) return;
                 if (Math.abs(deltaY) >= Math.abs(deltaX)) {
                     moving = -1;
                 } else {
@@ -139,10 +139,12 @@ function main(mainPath, historyName = "") {
             }, 20);
         }
     };
-    on("transitionend")(layer, function (event) {
+    var update = function (event) {
         if (event.target !== this) return;
         dispatch(window, 'resize');
-    });
+    };
+    on("transitionrun")(layer, update);
+    on("transitionend")(layer, update);
     layer.closeLeft = function () {
         closed = true;
         bindClass();

package/coms/zimoli/autodragchildren.js

@@ -21,33 +21,33 @@ var moveChildrenX = function (targetBox, previousElements, followedElements, mov
             var dragPosition = getScreenPosition(dragTarget);
             var dragPositionLeft = dragPosition.left;
             var dragPositionRight = dragPosition.left + dragPosition.width;
-            previousElements.map(function (element) {
+            previousElements.forEach(function (element) {
                 var elementPosition = getScreenPosition(element);
                 var elementCenter = elementPosition.left + elementPosition.width / 2;
                 var delta = elementCenter - (element.moved || 0);
-                if (delta + 7 <= dragPositionLeft) {
+                if (delta + 2 <= dragPositionLeft) {
                     recover(element);
-                } else if (delta - 7 >= dragPositionLeft) {
+                } else if (delta - 2 >= dragPositionLeft) {
                     moveMargin(element, dragPosition.width);
                 }
             });
-            followedElements.map(function (element) {
+            followedElements.forEach(function (element) {
                 var elementPosition = getScreenPosition(element);
                 var elementCenter = elementPosition.left + elementPosition.width / 2;
                 var delta = elementCenter - (element.moved || 0);
-                if (delta + 6 <= dragPositionRight) {
+                if (delta + 2 <= dragPositionRight) {
                     moveMargin(element, -dragPosition.width);
-                } else if (delta - 6 >= dragPositionRight) {
+                } else if (delta - 2 >= dragPositionRight) {
                     recover(element);
                 }
             });
         } else {
-            previousElements.map(recover);
-            followedElements.map(recover);
+            previousElements.forEach(recover);
+            followedElements.forEach(recover);
         }
     } else {
-        previousElements.map(recover);
-        followedElements.map(recover);
+        previousElements.forEach(recover);
+        followedElements.forEach(recover);
     }
 };
 var scrollX = function (targetBox, moveChildren) {
@@ -65,6 +65,7 @@ var scrollX = function (targetBox, moveChildren) {
         vscroll.X.call(targetBox, scrollDelta / 16, false);
         moveChildren();
     }
+    return scrollDelta;
 };
 var scrollY = arriswise(scrollX, arguments);
 var moveMarginY = arriswise(moveMarginX, arguments);
@@ -84,14 +85,9 @@ var bindTarget = function (index, element) {
 };
 
 var hooka = function (matcher, move, event, targetChild, isMovingSource) {
-    var dragbox = this.dragbox;
-    if (dragbox instanceof Function) {
-        dragbox = dragbox.call(this);
-        if (dragbox && !getTargetIn(dragbox, event.target)) return;
-    }
-    else {
-        dragbox = this;
-    }
+    var boxfinder;
+    var isMovingSource = isMovingSource !== false;
+    if (isMovingSource === false) boxfinder = matcher, matcher = null;
     var that = this;
 
     var draggingSourceOpacity = isMovingSource !== false ? 0 : 1;
@@ -100,7 +96,7 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
         moveMargin(element, 0);
     };
     var cloneCell = function (element) {
-        var targets = getTargetIn(matcher, element, false);
+        var targets = matcher ? getTargetIn(matcher, element, false) : element;
         if (isArray(targets)) {
             var extra = targets.slice(1);
             targets = cloneVisible(targets[0]);
@@ -131,6 +127,7 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
     };
     var getBoundingClientRect = function () { return getScreenPosition(this.target) }
     var bindExtra = function (element) {
+        if (!matcher) return element;
         var targets = getTargetIn(matcher, element, false);
         if (isArray(targets)) {
             var [target] = targets;
@@ -150,11 +147,10 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
     }
     var targetBox, saved_opacity, saved_filter, moveMargin, moveChildren;
     var previousElements, followedElements, rebuildTargets, scroll;
-    var that = this;
     var draginit = function () {
         that.setAttribute('dragchildren', '');
         if (targetBox) addClass(targetBox, 'dropping');
-        if (getTargetIn(dragbox, targetChild)) {
+        if (isMovingSource !== false) {
             targetBox = targetChild.parentNode;
             previousElements = getPreviousElementSiblings(targetChild);
             followedElements = getFollowedElementSiblings(targetChild);
@@ -168,7 +164,7 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
             followedElements = [];
             moveChildren = () => { };
             rebuildTargets = function () {
-                var temp = matcher(drag.target);
+                var temp = boxfinder(drag.target);
                 if (temp === targetBox) return;
                 if (previousElements) previousElements.map(recover);
                 if (followedElements) followedElements.map(recover);
@@ -186,16 +182,21 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
                 previousElements = [].slice.call(targetBox.children, 0).reverse();
                 followedElements = [];
                 [moveMargin, moveChildren, scroll] = getMoveFuncs(previousElements[0]);
-                moveChildren = moveChildren.bind(null, that, previousElements, followedElements, moveMargin, recover);
+                moveChildren = moveChildren.bind(null, targetBox, previousElements, followedElements, moveMargin, recover);
             };
         }
     };
     var dragfire = function () {
+        if (!targetBox) return;
         that.removeAttribute('dragchildren');
         removeClass(targetBox, "dropping");
         var dst, appendSibling, delta;
-        var src = previousElements.length;
-        if (previousElements.length && previousElements[0].moved) for (var cx = 1, dx = previousElements.length + 1; cx < dx; cx++) {
+        var k0 = -1;
+        for (var k0 in previousElements) break;
+        if (previousElements.length) var src = previousElements.length - k0;
+        else var src = 0;
+        if (k0 >= 0 && previousElements[k0].moved) for (var k in previousElements) {
+            var cx = +k + 1;
             if (!previousElements[cx]) {
                 dst = 0;
                 delta = 0;
@@ -207,14 +208,16 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
                 break;
             }
         }
-
-        if (followedElements.length && followedElements[0].moved) for (var cx = 1, dx = followedElements.length + 1; cx < dx; cx++) {
+        var k0 = -1;
+        for (var k0 in followedElements) break;
+        if (k0 >= 0 && followedElements[k0].moved) for (var k in followedElements) {
+            var cx = +k + 1;
             if (!followedElements[cx]) {
-                dst = followedElements.length + previousElements.length;
+                dst = targetBox.children.length - 1;
                 delta = 0;
                 appendSibling = appendChild.after;
             } else if (!followedElements[cx].moved) {
-                dst = previousElements.length + cx;
+                dst = targetBox.children.length - followedElements.length + cx - 1;
                 delta = 1;
                 appendSibling = appendChild.before;
                 break;
@@ -224,7 +227,8 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
             var children = targetBox.children;
             var srcElement = children[src];
             var dstElement = children[dst + delta];
-            src = bindTarget(src, srcElement);
+            console.log(targetChild, src)
+            src = bindTarget(src, isMovingSource ? targetChild : srcElement);
             dst = bindTarget(dst, dstElement);
             var needFire = !isFunction(move) || move(src, dst, dst + delta, appendSibling, targetBox) !== false;
             if (needFire && srcElement === children[src] && dstElement === children[dst + delta] && srcElement && dstElement) appendSibling(dstElement, srcElement);
@@ -244,8 +248,60 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
     var offmousup = on("mouseup")(window, offall);
     var autoScroll = function () {
         if (autoScroll.ing) return;
-        if (scroll);
-        autoScroll.ing = setInterval(scroll, 16);
+        if (scroll) autoScroll.ing = setInterval(function () {
+            var delta = scroll(targetBox, moveChildren);
+            if (isMovingSource === false) { }
+            else if (delta < 0) {
+                var p = null;
+                for (var k in previousElements) {
+                    if (!previousElements[k].parentNode) {
+                        delete previousElements[k];
+                        continue;
+                    }
+                    if (previousElements[+k + 1] && previousElements[k].previousElementSibling !== previousElements[+k + 1]) {
+                        previousElements.splice(+k + 1, previousElements.length - k - 1);
+                        break;
+                    }
+                }
+                var k = 0;
+                for (var k in followedElements) {
+                    if (followedElements[k].parentNode) break;
+                    delete followedElements[k];
+                }
+                var p = previousElements[previousElements.length - 1] || followedElements[k];
+                if (p && p.previousElementSibling) {
+                    k -= 1;
+                    if (k >= 0) followedElements[k] = p.previousElementSibling;
+                    else if (p === followedElements[0]) setOpacity(p.previousElementSibling, draggingSourceOpacity);
+                    else previousElements.push(p.previousElementSibling);
+                }
+            }
+            else if (delta > 0) {
+                for (var k in followedElements) {
+                    if (!followedElements[k].parentNode) {
+                        delete followedElements[k];
+                        continue;
+                    }
+                    if (followedElements[+k + 1] && followedElements[k].nextElementSibling !== followedElements[+k + 1]) {
+                        followedElements.splice(+k + 1, followedElements.length - k - 1);
+                        break;
+                    }
+                }
+
+                var k = 0;
+                for (var k in previousElements) {
+                    if (previousElements[k].parentNode) break;
+                    delete previousElements[k];
+                }
+                var f = followedElements[followedElements.length - 1] || previousElements[k];
+                if (f && f.nextElementSibling) {
+                    k -= 1;
+                    if (k >= 0) previousElements[k] = f.nextElementSibling;
+                    else if (f === previousElements[0]) setOpacity(f.nextElementSibling, draggingSourceOpacity);
+                    else followedElements.push(f.nextElementSibling);
+                }
+            }
+        }, 16);
     };
     var cancelScroll = function () {
         clearInterval(autoScroll.ing);
@@ -321,7 +377,7 @@ var hookEvent = function (matcher, move, event) {
     hooka.call(this, matcher, move, event, targetChild);
 };
 function addhook() {
-    var mousedownEvent, targetElement, callback, matcher, dropid, allowdrops;
+    var mousedownEvent, targetElement, callback, boxfinder, dropid, allowdrops;
     [].forEach.call(arguments, function (arg) {
         switch (typeof arg) {
             case "string":
@@ -331,7 +387,7 @@ function addhook() {
                 if (!callback) {
                     callback = arg;
                 } else {
-                    matcher = callback;
+                    boxfinder = callback;
                     callback = arg;
                 }
                 break;
@@ -354,7 +410,7 @@ function addhook() {
     if (!mousedownEvent) return;
     var target = targetElement || mousedownEvent.currentTarget;
     hooka.call(targetElement, function (target) {
-        var res = [].filter.call(allowdrops || (matcher ? matcher(target) : document.querySelectorAll("[allowdrop]")), function (child) {
+        var res = Array.prototype.filter.call(allowdrops || (boxfinder ? boxfinder(target) : document.querySelectorAll("[allowdrop]")), function (child) {
             return target && overlap(child, target);
         }).filter(e => {
             var a = e.getAttribute("allowdrop");

package/coms/zimoli/autodragchildren_test.html

@@ -74,7 +74,7 @@
         </tr>
     </tbody>
 </table>
-<list>
+<list cell-list>
     <div>&nbsp;cell_1</div>
     <div>&nbsp;cell_2</div>
     <div>&nbsp;cell_3</div>
@@ -88,4 +88,8 @@
     <div>&nbsp;cell_b</div>
     <div>&nbsp;cell_c</div>
     <div>&nbsp;cell_d</div>
-</list>
+</list>
+
+<xlist -src="a in xsrc">
+    <div> list-item <span -bind="a"></span></div>
+</xlist>

package/coms/zimoli/autodragchildren_test.js

@@ -3,7 +3,22 @@ function main() {
     page.innerHTML = autodragchildren_test;
     var body = page.querySelector("tbody");
     autodragchildren(body, body);
-    var list = page.querySelector("list");
-    autodragchildren(list, list);
+    var cellList = page.querySelector("list");
+    autodragchildren(cellList, cellList);
+    var xList = page.querySelector("xlist");
+    render(xList, {
+        xlist: list,
+        xsrc: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30],
+    })
+    autodragchildren(xList, xList, function (src, dst) {
+        var xsrc = xList.$scope.xsrc;
+        var src = src.target.index || 0;
+        var dst = xList.children[dst].index || 0;
+        var [e] = xsrc.splice(src, 1);
+        xsrc.splice(dst, 0, e);
+        render.refresh();
+        return false;
+    });
+
     return page;
 }

package/coms/zimoli/autodragchildren_test.less

@@ -1,8 +1,13 @@
-list {
+list[cell-list] {
+    display: table-row;
     >div {
-        display: inline-block;
+        display: table-cell;
     }
 }
+xlist>div{
+    display: inline-block;
+    padding: 0 6px;
+}
 
 .row(@x) {
     @row: ~"[row@{x}]";

package/coms/zimoli/bindtouch.js

@@ -22,7 +22,7 @@ function bindtouch(target, bindder, lockDirection = false) {
             var deltay = clientY - saved_y;
             if (lockDirection) {
                 if (!direction) {
-                    if (abs(deltax) < MOVELOCK_DELTA && abs(deltay) < MOVELOCK_DELTA) return;
+                    if (!onclick.preventClick) return;
                     if (target.onmovestart) {
                         target.onmovestart();
                     }
@@ -31,7 +31,7 @@ function bindtouch(target, bindder, lockDirection = false) {
                     } else if (abs(deltax) <= .618 * abs(deltay)) {
                         direction = "y";
                     } else {
-                        return;
+                        direction = 'o';
                     }
                 }
                 if (direction !== lockDirection)

package/coms/zimoli/cloneVisible.js

@@ -61,7 +61,7 @@ var cloneChildren = function (td, copy, clone) {
             });
             break;
         default:
-            var children = [].slice.call(td.childNodes, 0).filter(isMaybeVisible);
+            var children = Array.prototype.slice.call(td.childNodes, 0).filter(isMaybeVisible);
             children.sort((a, b) => {
                 return getZIndex(a) - getZIndex(b);
             }).forEach(clone);
@@ -130,21 +130,20 @@ var cloneVisible = function (td) {
     var _left, _top, _right, _bottom;
     var span = document.createElement("x");
     var hasSvg = false;
-
     var clone = function (td) {
         if (!isMaybeVisible(td)) return;
         if (td.nodeType === 3) {
             var copy = span.cloneNode();
             copy.appendChild(td.cloneNode());
             var parentNode = td.parentNode;
+            parentNode.insertBefore(copy, td);
             parentNode.removeChild(td);
-            parentNode.appendChild(copy);
             var { left, top, width, height } = getScreenPosition(copy);
             var style = getComputedStyle(copy);
             copyStyle(style, copy.style, cloneProperties);
             copy.style.lineHeight = height + "px";
+            parentNode.insertBefore(td, copy);
             parentNode.removeChild(copy);
-            parentNode.appendChild(td);
             result.appendChild(copy);
         } else if (td.nodeType !== 1) return;
 
@@ -187,7 +186,7 @@ var cloneVisible = function (td) {
         width: _right - _left + "px",
         height: _bottom - _top + "px"
     });
-    [].map.call(result.children, function (element) {
+    Array.prototype.map.call(result.children, function (element) {
         var { left, top, width, height } = element.tempstyle;
         extend(element.style, {
             position: "absolute",

package/coms/zimoli/drag.js

@@ -33,7 +33,7 @@ var setZIndex = function () {
     }
 };
 function drag(target, initialEvent, preventOverflow, isMovingSource) {
-    if (/^(?:select|input|textarea)$/i.test(initialEvent.target.tagName) || getTargetIn(a => a.nodrag || a.hasAttribute('nodrag') || a.dragable === false, initialEvent.target)) return;
+    if (/^(?:select|input|textarea)$/i.test(initialEvent.target.tagName) || getTargetIn(a => a.nodrag || a.hasAttribute('nodrag'), initialEvent.target)) return;
     if (target.dragable === false) return;
     initialEvent.preventDefault();
     if (isArray(target)) {
@@ -57,11 +57,9 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
     var mousemove = function (event) {
         if (event.moveLocked) return;
         if (/resize/i.test(getComputedStyle(document.body).cursor)) return;
-        event.moveLocked = true;
         if (!saved_delta.ing) {
-            var abs = Math.abs;
             var [target_left, target_top] = getOffset(target);
-            if (abs(target_left - event.screenX - saved_delta.x) < MOVELOCK_DELTA && abs(target_top - event.screenY - saved_delta.y) < MOVELOCK_DELTA) return;
+            if (!onclick.preventClick) return;
             saved_delta.ing = true;
             drag.target = target;
             dispatch("dragstart", target);
@@ -82,6 +80,7 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
             saved_delta.x += clone_left - target_left;
             saved_delta.y += clone_top - target_top;
         }
+        event.moveLocked = true;
         drag.target = clone;
         var offsetLeft = saved_delta.x + event.screenX;
         var offsetTop = saved_delta.y + event.screenY;

package/coms/zimoli/list.js

@@ -46,21 +46,22 @@ function ylist(container, generator, $Y) {
         var children = list.childNodes;
         for (var cx = 0, dx = children.length; cx < dx; cx++) {
             var child = children[cx];
-            if (!(isFinite(child.index) || nodeType === 2 && child.offsetHeight)) continue;
-            child = getNodeTarget(child);
+            if (!(isFinite(child.index) && (nodeType === 0 || child.index !== null) || nodeType === 2 && child.offsetHeight)) continue;
+            if (nodeType === 1) child = getNodeTarget(child);
             return child;
         }
         return null;
     };
-    var getFirstVisibleElement = function (deltaY = 0) {
+    var getFirstVisibleElement = function (deltaY) {
         var children = list.childNodes;
         var { scrollTop } = list;
-        scrollTop += deltaY;
+        deltaY = +deltaY;
+        if (deltaY) scrollTop += deltaY;
         for (var cx = 0, dx = children.length; cx < dx; cx++) {
             var child = children[cx];
-            if (!isFinite(child.index)) continue;
-            child = getNodeTarget(child);
-            if (child.offsetTop + child.offsetHeight > scrollTop) return child;
+            if (!isFinite(child.index) || child.index === null) continue;
+            var c = getNodeTarget(child);
+            if (c.offsetTop + c.offsetHeight > scrollTop) return deltaY === 0 ? child : c;
         }
         return null;
     };
@@ -86,16 +87,17 @@ function ylist(container, generator, $Y) {
             return scrollBy(deltab < deltat ? deltat : deltab);
         }
     };
-    var getLastVisibleElement = function (deltaY = 0) {
+    var getLastVisibleElement = function (deltaY) {
         var { scrollTop } = list;
-        scrollTop += deltaY;
+        deltaY = +deltaY;
+        if (deltaY) scrollTop += deltaY;
         var children = list.children;
         for (var cx = children.length - 1; cx >= 0; cx--) {
             var child = children[cx];
             if (!isFinite(child.index)) continue;
-            child = getNodeTarget(child);
-            if (child.offsetTop < scrollTop + list.clientHeight) {
-                return child;
+            var c = getNodeTarget(child);
+            if (c.offsetTop < scrollTop + list.clientHeight) {
+                return deltaY === 0 ? child : c;
             }
         }
         return null;
@@ -106,7 +108,7 @@ function ylist(container, generator, $Y) {
         var map = {};
         for (var cx = 0, dx = children.length; cx < dx; cx++) {
             var child = children[cx];
-            if (isFinite(child.index)) {
+            if (isFinite(child.index) && child.index !== null) {
                 map[child.index] = child;
             }
         }
@@ -133,7 +135,8 @@ function ylist(container, generator, $Y) {
         if (itemIndex < 0) index--;
         var ratio = itemIndex - index || 0;
         var childrenMap = getChildrenMap();
-        var offsetBottom = 0, ratioTop = 0, offset = index, last_item = getFirstElement() || null, last_index = last_item && last_item.index || offset;
+        var offsetBottom = 0, ratioTop = 0, offset = index, last_item = getFirstElement(0) || null, last_index = last_item && last_item.index || offset;
+        if (last_item) last_item = getNodeTarget(last_item);
         var count = 0, delta = 1, bottom_item, offsett = offset, offsetb = offset, top_item;
         var indexed_item;
         while (offsetBottom - ratioTop <= list.clientHeight + cache_height || indexed_item && top_item && indexed_item.offsetTop - top_item.offsetTop < cache_height) {
@@ -187,9 +190,9 @@ function ylist(container, generator, $Y) {
     var runbuild = lazy(function () {
         patchBottom();
         patchTop();
-        var firstElement = getFirstElement(1), y;
+        var firstElement = getFirstElement(), y;
         if (firstElement) {
-            y = firstElement.index * firstElement.offsetHeight;
+            y = firstElement.index * getNodeTarget(firstElement).offsetHeight;
         } else {
             y = 0;
         }
@@ -208,9 +211,10 @@ function ylist(container, generator, $Y) {
     list.insertBefore(topinsert, list.firstChild);
     //计算当前高度
     var currentY = function () {
-        var firstElement = getFirstElement(1);
+        var firstElement = getFirstElement();
         if (!firstElement) return;
         var index = firstElement.index;
+        firstElement = getNodeTarget(firstElement);
         if (index < 0) index = index - index | 0;
         return index * firstElement.offsetHeight + list.scrollTop;
     };
@@ -298,7 +302,7 @@ function ylist(container, generator, $Y) {
         var cache_height = list.offsetHeight;
 
         var childrenMap = getChildrenMap();
-        var first_element, flag_element = first_element = getFirstElement(1);
+        var first_element, flag_element = first_element = getFirstElement();
         if (!flag_element || !isFinite(flag_element.offsetTop)) return;
         var offset = flag_element.index || 0;
         var offsetTop = flag_element.offsetTop;
@@ -421,15 +425,17 @@ function ylist(container, generator, $Y) {
     list.scrollBy = scrollBy;
     list.index = function (update) {
         if (update === false) return saved_itemIndex;
-        var firstVisible = getFirstVisibleElement();
+        var firstVisible = getFirstVisibleElement(0);
         if (!firstVisible) return saved_itemIndex;
         var index = firstVisible.index;
+        firstVisible = getNodeTarget(firstVisible);
+        if (!firstVisible) return saved_itemIndex;
         var firstElement = getFirstElement(1);
         var scrolled = (list.scrollTop - firstVisible.offsetTop + firstElement.offsetTop + .5 | 0) / firstVisible.offsetHeight;
         return index + scrolled;
     };
     list.topIndex = function () {
-        var element = getFirstElement(1);
+        var element = getFirstElement();
         return element ? element.index : 0;
     };
     list.getIndexedElement = getIndexedElement;

package/coms/zimoli/pagination.html

@@ -4,7 +4,7 @@
 <btn class="prev" ng-click="prev()">
     ◀
 </btn>
-<xlist elementid='pglist' ng-src="page in pages" ng-style="{width:fromPixel(40*pages.length)}">
+<xlist #pglist ng-src="page in pages">
     <btn class="item">
         <span ng-bind=page></span>
     </btn>