efront 3.25.7 → 3.25.8

package/apps/_index.html

@@ -9,7 +9,7 @@
     <meta charset="utf-8" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link rel="Shortcut Icon" href="/favicon.ico" type="image/x-icon" />
-    <meta name="viewport" content="initial-scale=1,maximum-scale=1,width=device-width" />
+    <meta name="viewport" content="initial-scale=1,maximum-scale=1,width=device-width,user-scalable=no,initial-scale=1" />
     <title>efront 项目</title>
     <script deleteoncompile efrontloader>
         // 若要在开发环境使用内置组件，请保留此script标签中的代码，在编译发布时，这里的代码会自动删除

package/coms/basic/Item.js

@@ -1,5 +1,6 @@
 var id = 0;
 class Item extends Array {
+    extended = false;
     constructor(value) {
         super();
         this.children = this;
@@ -7,10 +8,11 @@ class Item extends Array {
         this.total = 0;//子项中的节点数
         this.crack = 0;
         this.id = ++id;
-        this.extends(value);
+        this.extends(value, false);
     }
-    extends(value) {
-        if (value instanceof Item) this.value = value.value;
+    extends(value, mark) {
+        this.extended = mark !== false;
+        if (value && value.constructor === Item) this.value = value.value;
         else this.value = value;
         if (value.children instanceof Array) {
             var children = value.children.map(item => new Item(item));
@@ -33,6 +35,14 @@ class Item extends Array {
             this.tab = 1;
         }
     }
+    get disabled() {
+        if (isObject(this.value)) return this.value.disabled || this.value.enabled === false;
+
+        return false;
+    }
+    get hotkey() {
+        if (isObject(this.value)) return this.value.hotkey;
+    }
 
     valueOf() {
         return this.value;

package/coms/basic/Speed.js

@@ -1,18 +1,25 @@
 function inertia(gun) {
     var _decreased = 0, spd = new Speed;
+    var lastTime = 0;
     var _decrease = function () {
+        lastTime = Speed.now() - 1;
+        _decrease0();
+    }
+    var _decrease0 = function () {
         if (
             decrease instanceof Function
         ) {
             if (!spd.length || _decreased > 0 && spd.filter(a => a !== 0).length === 0) return;
             var id = smooth_timer;
-            var res = decrease(_decreased++, spd);
+            var now = Speed.now();
+            var res = decrease(now - lastTime, spd);
+            lastTime = now;
             if (smooth_timer !== id) return;
             if (res === false || isEmpty(res)) {
                 spd.unset();
                 return;
             }
-            smooth_timer = requestAnimationFrame(_decrease);
+            smooth_timer = requestAnimationFrame(_decrease0);
         }
     };
     var _cancel = function () {
@@ -26,7 +33,7 @@ function inertia(gun) {
             _decrease();
             return;
         }
-        if (args.filter(a => Math.abs(a) > .5).length === 0) {
+        if (!decrease && args.filter(a => Math.abs(a) > .5).length === 0) {
             spd.reset();
             return;
         }
@@ -63,6 +70,7 @@ function inertia(gun) {
 class Speed extends Array {
     cache = [];
     stamp = 0;
+    deltat = 0;
     static now() {
         return performance.now ? performance.now() : Date.now();
     }
@@ -103,20 +111,26 @@ class Speed extends Array {
         if (this.stamp) ratio = now - this.stamp;
         else ratio = deltat;
         if (ratio > 160) ratio = 1e-3;
+        if (this.deltat) {
+            if (deltat > this.deltat * 10) {
+                ratio = 1e-3;
+            }
+        }
+        this.deltat = deltat;
         this.stamp = now;
         var sum = 0;
         for (var v of values) sum += v * v;
         v = Math.sqrt(sum) * ratio;
         if (v > 1) {
-            v = Math.sqrt(v * (v - 1)) / v;
+            v = Math.sqrt(v * (v - .996)) / v;
         }
         else {
-            v = 1e-7;
+            v = .9;
         }
         var r = ratio * v;
         for (var cx = 0, dx = values.length; cx < dx; cx++) {
             values[cx] *= r;
-            this[cx] *= v;
+            if (Math.abs(this[cx]) > .1) this[cx] *= v;
         }
         return values;
     }

package/coms/basic/Tree.js

@@ -6,7 +6,7 @@ class Tree extends Array {
     count = 0;
     total = 0;
     constructor(src) {
-        if (src instanceof Tree) return src;
+        if (src && src.coustructor === Tree) return src;
         if (src instanceof Array && src[0] && ('tab' in src[0] || 'deep' in src[0])) {
             return Tree.fromArray(src);
         }
@@ -20,7 +20,7 @@ class Tree extends Array {
         this.root = this;
     }
     static fromData(array) {
-        if (array instanceof Tree) return array;
+        if (array && array.coustructor === Tree) return array;
         var root = new Tree;
         root.tab = -Infinity;
         root.count = 0;
@@ -82,7 +82,7 @@ class Tree extends Array {
         return root;
     }
     static fromArray(array) {
-        if (array instanceof Tree) return array;
+        if (array && array.constructor === Tree) return array;
         var root = new Tree;
         root.tab = -Infinity;
         root.count = 0;
@@ -162,7 +162,7 @@ class Tree extends Array {
         var datas = [];
         for (var cx = 1, dx = arguments.length; cx < dx; cx++) {
             var arg = arguments[cx];
-            if (arg instanceof Item) datas.push(arg);
+            if (arg && arg.constructor === Item) datas.push(arg);
             else if (arg instanceof Array) datas.push.apply(datas, arg);
             else datas.push(arg);
         }

package/coms/basic/loader.js

@@ -40,6 +40,7 @@ if (PREVENT_FRAMEWORK_MODE !== false) {
         return;
     }
 }
+var efront_time = +new Date;
 var _devicePixelRatio = devicePixelRatio;
 var request = window.request || function (url, onload, onerror, version) {
     var xhr = new (XMLHttpRequest || ActiveXObject)("Microsoft.XMLHTTP");
@@ -653,12 +654,7 @@ var removeGlobalProperty = function (property) {
 };
 
 var renderPixelRatio = !/win/i.test(navigator.platform) && devicePixelRatio > 1 && window.innerWidth > 360 && window.innerHeight > 360 ? .86 : .75;
-if (document.querySelector && devicePixelRatio > 1 && /Linux/.test(navigator.platform) && navigator.maxTouchPoints > 0) {
-    let ratio = +(1000000 / devicePixelRatio + .5 | 0) / 1000000;
-    document.querySelector("meta[name=viewport]").setAttribute("content", `width=device-width,target-densitydpi=device-dpi,user-scalable=no,initial-scale=1,maximum-scale=${ratio}`);
-    renderPixelRatio *= devicePixelRatio;
-    devicePixelRatio = 1;
-}
+
 var initPixelDecoder = function () {
     if (pixelDecoder instanceof Function) {
         modules.fromPixel = pixelDecoder;
@@ -832,8 +828,7 @@ var loadResponseTreeFromStorage = function () {
     };
 };
 var preLoad = function () { };
-
-var start_time = +new Date / 1000 | 0;
+var start_time = efront_time / 1000 | 0;
 var errored = {};
 var modules = {
     isProduction,
@@ -868,6 +863,14 @@ var hook = function (requires_count) {
     modules.Promise = Promise;
     modules.hook_time = +new Date;
     if (!efrontPath) efrontPath = document.body.getAttribute("main-path") || document.body.getAttribute("path") || document.body.getAttribute("main") || "zimoli";
+    if (modules.hook_time - efront_time < (isProduction ? 30 : 5) && document.querySelector && devicePixelRatio > 1 && /Linux/.test(navigator.platform) && navigator.maxTouchPoints > 0) {
+        let ratio = +(1000000 / devicePixelRatio + .5 | 0) / 1000000;
+        document.querySelector("meta[name=viewport]").setAttribute("content", `width=device-width,target-densitydpi=device-dpi,user-scalable=no,initial-scale=1,maximum-scale=${ratio}`);
+        renderPixelRatio *= devicePixelRatio;
+        modules.renderPixelRatio = renderPixelRatio;
+        devicePixelRatio = modules.devicePixelRatio = 1;
+    }
+
     init(efrontPath, function (zimoli) {
         if (zimoli instanceof Function) zimoli();
     });

package/coms/frame/route.js

@@ -108,6 +108,8 @@
                 if (path) item.path = path;
                 if (data) item.params = parseKV(data);
                 item.closed = true;
+                if (filter) var item0 = filter(item);
+                if (item0) item = item0;
                 return item;
             });
             return items;
@@ -231,10 +233,14 @@
         result.then = then;
         return result;
     };
-    result.parse = function (items) {
+    var filter = null;
+    result.parse = function (items, f) {
+        filter = f;
         keymap = {};
         items = parseMenuList(items);
         items.keymap = keymap;
+        filter = null;
+        keymap = null;
         return items;
     };
     var then = function (ok, oh) {

package/coms/kugou/playList.less

@@ -13,6 +13,12 @@
     transition: margin .2s ease-out;
 }
 
+>list.body {
+    overflow-x: hidden;
+    overflow-y: scroll;
+    padding: 0;
+}
+
 
 list>padding {
     display: block;

package/coms/zimoli/hexagon.js

@@ -0,0 +1,33 @@
+var hexagon = function (c = "#fff", lineWidth = devicePixelRatio) {
+    var image = document.createElement('canvas');
+    image.width = 9 * lineWidth;
+    image.height = 16 * lineWidth;
+    image.src = true;
+    var { width, height } = image;
+    var w = width;
+    var h = height;
+
+    var ctx = image.getContext("2d");
+    ctx.beginPath();
+    var cx = lineWidth / 2;
+    var cy = 0;
+    ctx.moveTo(cx, cy);
+    /* |   */ctx.lineTo(cx, cy + h / 6);
+    /*  \  */ctx.lineTo(cx + w / 2, cy + h / 3);
+    /*   | */ctx.lineTo(cx + w / 2, cy + h * 2 / 3);
+    /*  /  */ctx.lineTo(cx, cy + h * 5 / 6);
+    /* |   */ctx.lineTo(cx, cy + h);
+    ctx.moveTo(cx + w / 2, cy + h / 3);
+    /*   / */ctx.lineTo(cx + w, cy + h / 6);
+    ctx.moveTo(cx + w / 2, cy + h * 2 / 3);
+    /*   \ */ctx.lineTo(cx + w, cy + h * 5 / 6);
+    ctx.moveTo(cx, cy + h / 6);
+    ctx.lineTo(cx - w / 2, cy + h / 3);
+    ctx.moveTo(cx - w / 2, cy + h * 2 / 3);
+    ctx.lineTo(cx, cy + h * 5 / 6);
+    ctx.strokeStyle = c;
+    ctx.lineWidth = lineWidth;
+    ctx.stroke();
+    image.complete = true;
+    return image;
+}

package/coms/zimoli/list.js

@@ -365,7 +365,7 @@ function ylist(container, generator, $Y) {
         }
     };
     list.getLastVisibleElement = getLastVisibleElement;
-    list.$stopY = function (count, spd) {
+    list.$stopY = function (t, spd) {
         var firstElement = getFirstVisibleElement();
         var lastElement = getLastVisibleElement();
         if (!firstElement || !lastElement || !list.clientHeight) return false;
@@ -388,15 +388,15 @@ function ylist(container, generator, $Y) {
         }
         var target_y = Math.abs(target_ty - last_y) > Math.abs(target_by - last_y) ? target_by : target_ty;
         var delta = Math.min(calcPixel(60), list.clientHeight >> 2);
-        var deltay = Math.abs(target_y - last_y), y;
-        if (deltay >= delta) {
+        var absy = Math.abs(target_y - last_y), y;
+        if (absy >= delta) {
             return false;
         }
-        if (deltay < 2) y = target_y;
+        if (absy <= 1) y = target_y;
         else {
             var speed = Math.abs(spd.read()[0]);
             if (speed < 1) speed = 1;
-            if (deltay < 3) speed = .5;
+            if (absy < 3) speed = .5;
             y = last_y + (target_y > last_y ? speed : -speed);
         }
         list.$Top(y);

package/coms/zimoli/menuItem.html

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

package/coms/zimoli/menuItem.less

@@ -1,6 +1,6 @@
 i {
     display: inline-block;
-    width: 1em;
+    vertical-align: middle;
 }
 
 .hotkey {

package/coms/zimoli/menuList.js

@@ -210,7 +210,7 @@ function main() {
         });
     }
     on("blur")(page, unfocus);
-    var template = page.tempalte || document.createElement("ylist");
+    var template = page.tempalte || document.createElement(page.tagName);
     if (!page.tempalte) {
         template.className = '';
         template.removeAttribute('mode');
@@ -224,12 +224,11 @@ function main() {
         time = +time;
         if (byMousedown && !time) return;
         if (time) byMousedown = false;
-
         if (page.ispop || time) popTimer = setTimeout(function () {
             if (time) byMousedown = elem;
             page.setFocus(elem);
             popMenu(elem.menu, elem);
-        }, time || 10);
+        }, time || 60);
     };
     var cancel = function () {
         clear();
@@ -280,7 +279,7 @@ function main() {
     };
     var open1 = function (event) {
         if (event.which === 3) event.preventDefault();
-        if (istoolbar) open.call(this, event.which === 3 ? 20 : 600);
+        if (istoolbar) open.call(this, event.which === 3 ? 20 : 300);
     };
     if (!page.children.length || page.menutype === 1) {
         page.menutype = 1;
@@ -297,7 +296,7 @@ function main() {
             "menu-item"(e, s) {
                 if (e && s === e.$scope) s = itemName ? s[itemName] : s.menu;
                 var a = button(
-                    menuItem(e, s.value, this.hasIcon)
+                    menuItem(e, s, this.hasIcon)
                 );
                 if (!page.firstMenu) {
                     page.firstMenu = a;
@@ -325,23 +324,27 @@ function main() {
             list(page, function (index) {
                 var item = items[index];
                 if (!item) return;
-                if (!(item instanceof Item)) item = new Item(item);
+                if (item.constructor !== Item) item = new Item(item);
                 var a = $scope["menu-item"](null, item);
                 if (src.itemName) a.setAttribute("e-if", notHidden);
                 a.setAttribute("e-class", className);
                 a.setAttribute("on-mouseleave", "cancel.call(this)");
                 a.setAttribute("on-mouseenter", "popMenu.call(this)");
-                a.setAttribute("on-pointermove", "popMenu.call(this)");
                 a.setAttribute("on-click", "open.call(this)");
                 a.setAttribute("_menu", src.itemName);
-                if (istoolbar) a.setAttribute("on-pointerdown", "popMenu1");
+                if (istoolbar) {
+                    a.setAttribute("on-pointerdown", "popMenu1.call(this,event)");
+                    if (item.constructor === Item && item.length && !item.extended) {
+                        item.extends(item[0]);
+                    }
+                }
                 a = generator(index, item, a);
                 return a;
-            });
+            }, direction);
         }
         else {
             page.innerHTML = menuList;
-            $scope.menus = items.map(i => i instanceof Item ? i : new Item(i));
+            $scope.menus = items.map(i => i.constructor === Item ? i : new Item(i));
             render(page, $scope);
             vbox(page);
         }
@@ -359,11 +362,15 @@ function main() {
                 page.firstMenu = elem;
                 page.total = this.src.length;
             }
-            elem.menu = this.src[index];
+            var menu = elem.menu = this.src[index];
             on("mouseleave")(elem, cancel);
             on("mouseenter")(elem, open);
-            on("pointermove")(elem, cancel);
-            if (istoolbar) on("pointerdown")(elem, open1);
+            if (istoolbar) {
+                on("pointerdown")(elem, open1);
+                if (menu.constructor === Item && menu.length && !menu.extended) {
+                    menu.extends(menu[0]);
+                }
+            }
             on("click")(elem, fire);
             return elem;
         }, direction);

package/coms/zimoli/menuList.less

@@ -64,5 +64,4 @@
 
 i {
     display: inline-block;
-    width: 20px;
 }

package/coms/zimoli/moveupon.js

@@ -30,6 +30,7 @@ if (/Firefox/.test(navigator.userAgent)) on('dragstart')(document, function (e)
     }
 });
 var locktouch = function (target) {
+    if (target.resizable) return false;
     if (/(input|textarea|select)/i.test(target.tagName) || getTargetIn(a => String(a.contentEditable) === 'true' || a.draggable, target)) {
         return true;
     } else {

package/coms/zimoli/render.js

@@ -173,7 +173,7 @@ var createRepeat = function (search, id = 0) {
         var $parentScopes = element.$parentScopes || [];
         var $struct = element.$struct;
         if (element.$scope) {
-            $struct = extend({}, $struct, { context: $struct.context + `with(this.$parentScopes[${$parentScopes.length}])` }), $parentScopes = $parentScopes.concat(element.$scope);
+            $struct = extend({}, $struct, { context: $struct.context + `with(this.$parentScopes[${$parentScopes.length}])` }), $parentScopes = $parentScopes.slice(), $parentScopes.push(element.$scope);
         }
         var clonedElements1 = Object.create(null);
         var cloned = keys.map(function (key, cx) {

package/coms/zimoli/resize.js

@@ -155,6 +155,7 @@ resize.on = function (elem, dragHandle) {
     if (elem) {
         elem.dragHandle = dragHandle;
     }
+    elem.resizable = true;
     onmounted(elem, function () {
         if (!offmousemove) offmousemove = onmousemove(window, getResizer);
         if (!~resizingElements.indexOf(elem)) {

package/coms/zimoli/slider.js

@@ -112,29 +112,40 @@ function slider(autoplay, circle = true) {
             left: round((indexRight - index) * width) + "px"
         });
     };
+    var savedtime = 0;
+    var animate0 = function () {
+        savedtime = Speed.now() - 1;
+        animate();
+    };
     var animate = function () {
         cancelAnimationFrame(timer_animate);
         var width = outter.clientWidth;
+        var now = +Speed.now();
         if (abs(current_index + negative_index) < 1.25 / width)
             return reshape(-negative_index, false);
         timer_animate = requestAnimationFrame(animate);
-        reshape((current_index * 3 - negative_index) / 4);
+        var temp_index = current_index;
+        while (savedtime < now) {
+            temp_index = (temp_index * 11 - negative_index) / 12;
+            savedtime += 6;
+        }
+        reshape(temp_index);
     };
     var park = function () {
         direction = 0;
         var singleTarget = getSingleTarget();
-        var spd = _speed();
+        var spd = _speed() * 40;
         if (singleTarget) {
             negative_index = round(negative_index);
         }
         else if (delta_negative_index > 0) {
-            if (negative_index - floor(negative_index) > 0.2 / (1 + abs(spd)))
+            if (negative_index - floor(negative_index) > .007 / (.07 + abs(spd)))
                 negative_index = ceil(negative_index);
             else
                 negative_index = floor(negative_index);
         }
         else if (delta_negative_index < 0) {
-            if (ceil(negative_index) - negative_index > 0.2 / (1 + abs(spd)))
+            if (ceil(negative_index) - negative_index > .007 / (.07 + abs(spd)))
                 negative_index = floor(negative_index);
             else
                 negative_index = ceil(negative_index);
@@ -142,7 +153,8 @@ function slider(autoplay, circle = true) {
         else {
             negative_index = round(negative_index);
         }
-        animate();
+        savedtime = 0;
+        animate0();
         var event = createEvent("park");
         event.index = -negative_index;
         dispatch(outter, event);
@@ -176,7 +188,7 @@ function slider(autoplay, circle = true) {
             if (enabled) outter.go(outter.index + count);
         } else {
             if (enabled) negative_index -= count;
-            animate();
+            animate0();
         }
         return enabled;
     };
@@ -186,7 +198,7 @@ function slider(autoplay, circle = true) {
         var singleTarget = getSingleTarget();
         if (singleTarget) {
             var current_Left = singleTarget.offsetLeft;
-            var avail_deltaWidth = round(width >> 2);
+            var avail_deltaWidth = Math.min(round(width >> 2), 120);
             if (current_Left + deltax > avail_deltaWidth) {
                 deltax = avail_deltaWidth - current_Left;
                 saved_x += deltax;

package/coms/zimoli/table.js

@@ -424,10 +424,12 @@ function table(elem) {
         var $scope = {
             fields,
             isEmpty,
+            tbody0: null,
             tbody(e) {
                 var e = list.apply(null, arguments);
                 css(e, tbodyHeight(e));
                 css(e, { width: this.adapter.offsetWidth, display: 'block' });
+                this.tbody0 = e;
                 return e;
             },
             thead(t) {
@@ -440,7 +442,7 @@ function table(elem) {
                 return tr;
             },
             tbodyHeight,
-            data: Table.from(fields, await data),
+            data,
             adapter: null,
             resizeT,
             model,
@@ -455,6 +457,10 @@ function table(elem) {
             pagination
         };
         render(this, $scope, this.$parentScopes.concat(this.$scope));
+        $scope.data = Table.from(fields, await data);
+        $scope.data.callback = function () {
+            if ($scope.tbody0) $scope.tbody0.go($scope.tbody0.index());
+        };
     })
     autodragchildren(
         table,

package/coms/zimoli/touchList.js

@@ -24,7 +24,7 @@ var touchstart = function (event) {
     }
     if (!target) return;
     cancelAnimationFrame(target.scrollTimer);
-    saved_x = null;
+    saved_x = event.clientX, saved_y = event.clientY, moving = false, 0;
     currentTarget = target;
     if (!target.querySelector(".ylife-touch-delete")) {
         css(target, {
@@ -37,11 +37,10 @@ var touchstart = function (event) {
 };
 var moving = false;
 var touchmove = function (event) {
-    if (!saved_x) return saved_x = event.clientX, saved_y = event.clientY, moving = false, 0;
     var delta_x = event.clientX - saved_x;
     var delta_y = event.clientY - saved_y;
     if (!moving) {
-        if (Math.abs(delta_x) < 2 && Math.abs(delta_y) < 2) return;
+        if (Math.abs(delta_x) < MOVELOCK_DELTA && Math.abs(delta_y) < MOVELOCK_DELTA) return;
         if (Math.abs(delta_y) < Math.abs(delta_x)) {
             moving = 1;
         } else {
@@ -49,28 +48,35 @@ var touchmove = function (event) {
         }
     }
     if (moving !== 1) return;
-    event.preventDefault();
-    var marginLeft = -parseInt(currentTarget.scrollLeft) || 0;
-    if (delta_x + marginLeft > 0) {
-        delta_x = -marginLeft;
+    event.moveLocked = true;
+    var buttonWidth = currentTarget.scrollWidth - currentTarget.clientWidth;
+    var scrollLeft = -currentTarget.scrollLeft;
+    if (delta_x + scrollLeft > 0) {
+        delta_x = -scrollLeft;
     }
-    else if (delta_x + marginLeft < - calcPixel(85)) {
-        delta_x = -calcPixel(85) - marginLeft;
+    else if (delta_x + scrollLeft < - buttonWidth) {
+        delta_x = -buttonWidth - scrollLeft;
     }
-    marginLeft += delta_x;
+    scrollLeft += delta_x;
     saved_x += delta_x;
     direction = delta_x;
-    currentTarget.scrollLeft = -marginLeft;
+    currentTarget.scrollLeft = -scrollLeft;
 };
 var scrollTo = function (targetLeft) {
     if (!this) return;
     cancelAnimationFrame(this.scrollTimer);
     var that = this;
+    var scrollTime = +Speed.now();
     var reshape = function () {
-        var currentLeft = parseInt(that.scrollLeft) || 0;
+        var currentLeft = that.scrollLeft;
         if (0 === (0 | currentLeft - targetLeft)) return;
-        var thisTimeLeft = (targetLeft + currentLeft * 3) / 4 | 0;
-        if (Math.abs(thisTimeLeft - currentLeft) < 3) {
+        var now = +Speed.now();
+        var thisTimeLeft = currentLeft;
+        while (scrollTime < now) {
+            scrollTime += 6;
+            thisTimeLeft = (thisTimeLeft * 11 + targetLeft) / 12;
+        }
+        if (Math.abs(thisTimeLeft - currentLeft) < .5) {
             thisTimeLeft = targetLeft;
         } else {
             that.scrollTimer = requestAnimationFrame(reshape);
@@ -94,10 +100,10 @@ var scrollToRight = function () {
 var touchend = function () {
     var marginLeft = -parseInt(currentTarget.scrollLeft) || 0;
     moving = false;
-    if (direction < 0 && marginLeft < -calcPixel(20)) {
+    if (direction < 0 && marginLeft < -7) {
         scrollToLeft.call(currentTarget);
     }
-    else if (direction > 0 && marginLeft > -currentTarget.clientWidth + calcPixel(20)) {
+    else if (direction > 0 && marginLeft > -currentTarget.clientWidth + 7) {
         scrollToRight.call(currentTarget);
     }
     else if (marginLeft < currentTarget.clientWidth - currentTarget.scrollWidth >> 1) {
@@ -130,9 +136,5 @@ function touchList(listElement) {
         move: touchmove,
         end: touchend
     });
-    // ontouchstart(listElement, touchstart);
-    // ontouchmove(listElement, touchmove);
-    // ontouchend(listElement, touchend);
-    // ontouchcancel(listElement, touchend);
     return listElement;
 }