uikit 3.11.0 → 3.11.2-dev.19d26d0f9

package/dist/js/uikit.js

@@ -1,4 +1,4 @@
-/*! UIkit 3.11.0 | https://www.getuikit.com | (c) 2014 - 2022 YOOtheme | MIT License */
+/*! UIkit 3.11.2-dev.19d26d0f9 | https://www.getuikit.com | (c) 2014 - 2022 YOOtheme | MIT License */
 
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -1587,7 +1587,7 @@
         height: ['top', 'bottom']
     };
 
-    function dimensions(element) {
+    function dimensions$1(element) {
 
         var rect = isElement(element)
             ? toNode(element).getBoundingClientRect()
@@ -1605,7 +1605,7 @@
 
     function offset(element, coordinates) {
 
-        var currentOffset = dimensions(element);
+        var currentOffset = dimensions$1(element);
 
         if (element) {
             var ref = toWindow(element);
@@ -1750,19 +1750,35 @@
         if ( element === void 0 ) element = window;
         if ( offsetDim === void 0 ) offsetDim = false;
 
-        return isNumeric(value)
-            ? +value
-            : endsWith(value, 'vh')
-                ? percent(height(toWindow(element)), value)
-                : endsWith(value, 'vw')
-                    ? percent(width(toWindow(element)), value)
-                    : endsWith(value, '%')
-                        ? percent(offsetDim
-                            ? dimension(property)(element)
-                            : dimensions(element)[property], value)
-                        : toFloat(value);
+
+        if (!isString(value)) {
+            return toFloat(value);
+        }
+
+        return parseCalc(value).reduce(function (result, value) {
+            var unit = parseUnit(value);
+            if (unit) {
+                value = percent(
+                    unit === 'vh'
+                        ? height(toWindow(element))
+                        : unit === 'vw'
+                            ? width(toWindow(element))
+                            : offsetDim
+                                ? element[("offset" + (ucfirst(property)))]
+                                : dimensions$1(element)[property],
+                    value
+                );
+            }
+
+            return result + toFloat(value);
+        }, 0);
     }
 
+    var calcRe = /-?\d+(?:\.\d+)?(?:v[wh]|%|px)?/g;
+    var parseCalc = memoize(function (calc) { return calc.toString().replace(/\s/g, '').match(calcRe) || []; });
+    var unitRe = /(?:v[hw]|%)$/;
+    var parseUnit = memoize(function (str) { return (str.match(unitRe) || [])[0]; });
+
     function percent(base, value) {
         return base * toFloat(value) / 100;
     }
@@ -1800,8 +1816,6 @@
     };
 
     function flush(recursion) {
-        if ( recursion === void 0 ) recursion = 1;
-
         runTasks(fastdom.reads);
         runTasks(fastdom.writes.splice(0));
 
@@ -1823,7 +1837,7 @@
         if (recursion && recursion < RECURSION_LIMIT) {
             Promise$1.resolve().then(function () { return flush(recursion); });
         } else {
-            requestAnimationFrame(function () { return flush(); });
+            requestAnimationFrame(function () { return flush(1); });
         }
 
     }
@@ -2241,7 +2255,11 @@
             element = toNode(element);
         }
 
-        element.scrollTop = top;
+        if (isUndefined(top)) {
+            return element.scrollTop;
+        } else {
+            element.scrollTop = top;
+        }
     }
 
     function scrollIntoView(element, ref) {
@@ -2548,7 +2566,7 @@
         replaceClass: replaceClass,
         hasClass: hasClass,
         toggleClass: toggleClass,
-        dimensions: dimensions,
+        dimensions: dimensions$1,
         offset: offset,
         position: position,
         offsetPosition: offsetPosition,
@@ -2673,7 +2691,8 @@
         scrolledOver: scrolledOver,
         scrollParents: scrollParents,
         getViewport: getViewport$1,
-        getViewportClientHeight: getViewportClientHeight
+        getViewportClientHeight: getViewportClientHeight,
+        getScrollingElement: getScrollingElement
     });
 
     function globalAPI (UIkit) {
@@ -3462,7 +3481,7 @@
     UIkit.data = '__uikit__';
     UIkit.prefix = 'uk-';
     UIkit.options = {};
-    UIkit.version = '3.11.0';
+    UIkit.version = '3.11.2-dev.19d26d0f9';
 
     globalAPI(UIkit);
     hooksAPI(UIkit);
@@ -3483,7 +3502,7 @@
                 return;
             }
             pendingResize = true;
-            fastdom.write(function () { return pendingResize = false; });
+            fastdom.read(function () { return pendingResize = false; });
             UIkit.update(null, 'resize');
         };
 
@@ -3502,7 +3521,7 @@
                 return;
             }
             pending = true;
-            fastdom.write(function () { return pending = false; });
+            fastdom.read(function () { return pending = false; });
 
             UIkit.update(null, e.type);
 
@@ -5222,7 +5241,7 @@
             css(element, 'display', 'block', 'important');
         }
 
-        var height = dimensions(element).height - boxModelAdjust(element, 'height', 'content-box');
+        var height = dimensions$1(element).height - boxModelAdjust(element, 'height', 'content-box');
 
         if (style !== false) {
             css(element, 'display', style);
@@ -5264,7 +5283,7 @@
 
                 if (this.expand) {
 
-                    minHeight = height(window) - (dimensions(document.documentElement).height - dimensions(this.$el).height) - box || '';
+                    minHeight = height(window) - (dimensions$1(document.documentElement).height - dimensions$1(this.$el).height) - box || '';
 
                 } else {
 
@@ -5281,7 +5300,7 @@
 
                     if (this.offsetBottom === true) {
 
-                        minHeight += " - " + (dimensions(this.$el.nextElementSibling).height) + "px";
+                        minHeight += " - " + (dimensions$1(this.$el.nextElementSibling).height) + "px";
 
                     } else if (isNumeric(this.offsetBottom)) {
 
@@ -5293,7 +5312,7 @@
 
                     } else if (isString(this.offsetBottom)) {
 
-                        minHeight += " - " + (dimensions(query(this.offsetBottom, this.$el)).height) + "px";
+                        minHeight += " - " + (dimensions$1(query(this.offsetBottom, this.$el)).height) + "px";
 
                     }
 
@@ -5312,7 +5331,7 @@
                 css(this.$el, {minHeight: minHeight});
 
                 if (minHeight !== prev) {
-                    this.$update(this.$el, 'resize');
+                    trigger(this.$el, 'resize');
                 }
 
                 if (this.minHeight && toFloat(css(this.$el, 'minHeight')) < this.minHeight) {
@@ -7325,7 +7344,7 @@
 
                 return {
                     current: toFloat(css(this.$el, 'maxHeight')),
-                    max: Math.max(this.minHeight, height(this.container) - (dimensions(this.content).height - height(this.$el)))
+                    max: Math.max(this.minHeight, height(this.container) - (dimensions$1(this.content).height - height(this.$el)))
                 };
             },
 
@@ -7718,10 +7737,10 @@
 
         computed: {
 
-            offset: function(ref) {
+            offset: function(ref, $el) {
                 var offset = ref.offset;
 
-                return toPx(offset);
+                return toPx(offset, 'height', $el);
             },
 
             selTarget: function(ref, $el) {
@@ -7788,7 +7807,7 @@
                     var this$1$1 = this;
 
 
-                    if (!(this.targetOffset !== false && location.hash && window.pageYOffset > 0)) {
+                    if (!(this.targetOffset !== false && location.hash && scrollTop(window) > 0)) {
                         return;
                     }
 
@@ -7837,24 +7856,28 @@
 
                     height$1 = this.isActive ? height$1 : this.$el.offsetHeight;
 
-                    if (height$1 + this.offset > height(window)) {
-                        this.inactive = true;
-                        return false;
-                    }
+                    var overflow = Math.max(0, height$1 + this.offset - height(window));
 
                     var referenceElement = this.isFixed ? this.placeholder : this.$el;
-                    this.topOffset = offset(referenceElement).top;
-                    this.bottomOffset = this.topOffset + height$1;
-                    this.offsetParentTop = offset(referenceElement.offsetParent).top;
+                    var topOffset = offset(referenceElement).top;
+                    var offsetParentTop = offset(referenceElement.offsetParent).top;
 
-                    var bottom = parseProp('bottom', this);
+                    var top = parseProp(this.top, this.$el, topOffset);
+                    var bottom = parseProp(this.bottom, this.$el, topOffset + height$1);
 
-                    this.top = Math.max(toFloat(parseProp('top', this)), this.topOffset) - this.offset;
-                    this.bottom = bottom && bottom - this.$el.offsetHeight;
-                    this.width = dimensions(isVisible(this.widthElement) ? this.widthElement : this.$el).width;
+                    var start = Math.max(top, topOffset) - this.offset;
+                    var end = bottom
+                        ? bottom - this.$el.offsetHeight + overflow - this.offset
+                        : getScrollingElement(this.$el).scrollHeight - height(window);
 
                     return {
+                        start: start,
+                        end: end,
+                        overflow: overflow,
+                        topOffset: topOffset,
+                        offsetParentTop: offsetParentTop,
                         height: height$1,
+                        width: dimensions$1(isVisible(this.widthElement) ? this.widthElement : this.$el).width,
                         top: offsetPosition(this.placeholder)[0],
                         margins: css(this.$el, ['marginTop', 'marginBottom', 'marginLeft', 'marginRight'])
                     };
@@ -7886,14 +7909,29 @@
             {
 
                 read: function(ref) {
-                    var scroll = ref.scroll; if ( scroll === void 0 ) scroll = 0;
+                    var prevScroll = ref.scroll; if ( prevScroll === void 0 ) prevScroll = 0;
+                    var prevDir = ref.dir; if ( prevDir === void 0 ) prevDir = 'down';
+                    var overflow = ref.overflow;
+                    var overflowScroll = ref.overflowScroll; if ( overflowScroll === void 0 ) overflowScroll = 0;
+                    var start = ref.start;
+                    var end = ref.end;
 
 
-                    this.scroll = window.pageYOffset;
+                    var scroll = scrollTop(window);
+                    var dir = prevScroll <= scroll ? 'down' : 'up';
 
                     return {
-                        dir: scroll <= this.scroll ? 'down' : 'up',
-                        scroll: this.scroll
+                        dir: dir,
+                        prevDir: prevDir,
+                        scroll: scroll,
+                        prevScroll: prevScroll,
+                        overflowScroll: clamp(
+                            overflowScroll
+                            + clamp(scroll, start, end)
+                            - clamp(prevScroll, start, end),
+                            0,
+                            overflow
+                        )
                     };
                 },
 
@@ -7901,35 +7939,34 @@
                     var this$1$1 = this;
 
 
-                    var now = Date.now();
                     var isScrollUpdate = types.has('scroll');
                     var initTimestamp = data.initTimestamp; if ( initTimestamp === void 0 ) initTimestamp = 0;
                     var dir = data.dir;
-                    var lastDir = data.lastDir;
-                    var lastScroll = data.lastScroll;
+                    var prevDir = data.prevDir;
                     var scroll = data.scroll;
+                    var prevScroll = data.prevScroll; if ( prevScroll === void 0 ) prevScroll = 0;
                     var top = data.top;
+                    var start = data.start;
+                    var topOffset = data.topOffset;
+                    var height = data.height;
 
-                    data.lastScroll = scroll;
-
-                    if (scroll < 0 || scroll === lastScroll && isScrollUpdate || this.showOnUp && !isScrollUpdate && !this.isFixed) {
+                    if (scroll < 0 || scroll === prevScroll && isScrollUpdate || this.showOnUp && !isScrollUpdate && !this.isFixed) {
                         return;
                     }
 
-                    if (now - initTimestamp > 300 || dir !== lastDir) {
+                    var now = Date.now();
+                    if (now - initTimestamp > 300 || dir !== prevDir) {
                         data.initScroll = scroll;
                         data.initTimestamp = now;
                     }
 
-                    data.lastDir = dir;
-
-                    if (this.showOnUp && !this.isFixed && Math.abs(data.initScroll - scroll) <= 30 && Math.abs(lastScroll - scroll) <= 10) {
+                    if (this.showOnUp && !this.isFixed && Math.abs(data.initScroll - scroll) <= 30 && Math.abs(prevScroll - scroll) <= 10) {
                         return;
                     }
 
                     if (this.inactive
-                        || scroll < this.top
-                        || this.showOnUp && (scroll <= this.top || dir === 'down' && isScrollUpdate || dir === 'up' && !this.isFixed && scroll <= this.bottomOffset)
+                        || scroll < start
+                        || this.showOnUp && (scroll <= start || dir === 'down' && isScrollUpdate || dir === 'up' && !this.isFixed && scroll <= topOffset + height)
                     ) {
 
                         if (!this.isFixed) {
@@ -7944,7 +7981,7 @@
 
                         this.isFixed = false;
 
-                        if (this.animation && scroll > this.topOffset) {
+                        if (this.animation && scroll > topOffset) {
                             Animation.cancel(this.$el);
                             Animation.out(this.$el, this.animation).then(function () { return this$1$1.hide(); }, noop);
                         } else {
@@ -7994,23 +8031,37 @@
 
             update: function() {
 
-                var active = this.top !== 0 || this.scroll > this.top;
+                var ref = this._data;
+                var width = ref.width;
+                var scroll = ref.scroll; if ( scroll === void 0 ) scroll = 0;
+                var overflow = ref.overflow;
+                var overflowScroll = ref.overflowScroll; if ( overflowScroll === void 0 ) overflowScroll = 0;
+                var start = ref.start;
+                var end = ref.end;
+                var topOffset = ref.topOffset;
+                var height = ref.height;
+                var offsetParentTop = ref.offsetParentTop;
+                var active = start !== 0 || scroll > start;
                 var top = Math.max(0, this.offset);
                 var position = 'fixed';
 
-                if (isNumeric(this.bottom) && this.scroll > this.bottom - this.offset) {
-                    top = this.bottom - this.offsetParentTop;
+                if (scroll > end) {
+                    top = end + this.offset - offsetParentTop;
                     position = 'absolute';
                 }
 
+                if (overflow) {
+                    top -= overflowScroll;
+                }
+
                 css(this.$el, {
                     position: position,
                     top: (top + "px"),
-                    width: this.width
+                    width: width
                 });
 
                 this.isActive = active;
-                toggleClass(this.$el, this.clsBelow, this.scroll > this.bottomOffset);
+                toggleClass(this.$el, this.clsBelow, scroll > topOffset + height);
                 addClass(this.$el, this.clsFixed);
 
             }
@@ -8019,16 +8070,10 @@
 
     };
 
-    function parseProp(prop, ref) {
-        var $props = ref.$props;
-        var $el = ref.$el;
-        var propOffset = ref[(prop + "Offset")];
-
-
-        var value = $props[prop];
+    function parseProp(value, el, propOffset) {
 
         if (!value) {
-            return;
+            return 0;
         }
 
         if (isString(value) && value.match(/^-?\d/)) {
@@ -8037,7 +8082,7 @@
 
         } else {
 
-            return offset(value === true ? parent($el) : query(value, $el)).bottom;
+            return offset(value === true ? parent(el) : query(value, el)).bottom;
 
         }
     }
@@ -10734,11 +10779,9 @@
         computed: {
 
             props: function(properties, $el) {
-                var this$1$1 = this;
-
                 return keys(props).reduce(function (result, prop) {
                     if (!isUndefined(properties[prop])) {
-                        result[prop] = props[prop].call(this$1$1, prop, $el, properties[prop].slice());
+                        result[prop] = props[prop](prop, $el, properties[prop].slice());
                     }
                     return result;
                 }, {});
@@ -10746,6 +10789,12 @@
 
         },
 
+        events: {
+            bgimageload: function() {
+                this.$emit();
+            }
+        },
+
         methods: {
 
             reset: function() {
@@ -10893,15 +10942,15 @@
         var bgPos = css(el, 'backgroundPosition').split(' ')[prop === 'x' ? 0 : 1]; // IE 11 can't read background-position-[x|y]
 
         return getCssValue(el, 'backgroundSize', '') === 'cover'
-            ? backgroundCoverFn.call(this, prop, el, steps, bgPos, attr)
+            ? backgroundCoverFn(prop, el, steps, bgPos, attr)
             : setBackgroundPosFn(prop, steps, bgPos);
     }
 
     function backgroundCoverFn(prop, el, steps, bgPos, attr) {
 
-        var image = getBackgroundImage.call(this, el);
+        var dimImage = getBackgroundImageDimensions(el);
 
-        if (!image.naturalWidth) {
+        if (!dimImage.width) {
             return noop;
         }
 
@@ -10917,11 +10966,6 @@
             height: el.offsetHeight
         };
 
-        var dimImage = {
-            width: image.naturalWidth,
-            height: image.naturalHeight
-        };
-
         var baseDim = Dimensions.cover(dimImage, dimEl);
         var span = baseDim[attr] - dimEl[attr];
 
@@ -10952,26 +10996,34 @@
         };
     }
 
-    function getBackgroundImage(el) {
-        var this$1$1 = this;
-
+    var dimensions = {};
+    function getBackgroundImageDimensions(el) {
         var src = css(el, 'backgroundImage').replace(/^none|url\(["']?(.+?)["']?\)$/, '$1');
 
-        var data = this._data;
-
-        if (data[src]) {
-            return data[src];
+        if (dimensions[src]) {
+            return dimensions[src];
         }
 
+        var image = new Image();
         if (src) {
-            var img = new Image();
-            img.src = src;
-            if (!img.naturalWidth) {
-                img.onload = function () { return this$1$1.$update(); };
-            }
+            image.src = src;
 
-            return data[src] = img;
+            if (!image.naturalWidth) {
+                image.onload = function () {
+                    dimensions[src] = toDimensions(image);
+                    trigger(el, 'bgimageload');
+                };
+            }
         }
+
+        return dimensions[src] = toDimensions(image);
+    }
+
+    function toDimensions(image) {
+        return {
+            width: image.naturalWidth,
+            height: image.naturalHeight
+        };
     }
 
     function getStep(steps, percent) {
@@ -11042,16 +11094,18 @@
             start: function(ref) {
                 var start = ref.start;
 
-                return parseCalc(start, this.target);
+                return toPx(start, 'height', this.target, true);
             },
 
             end: function(ref) {
                 var end = ref.end;
                 var viewport = ref.viewport;
 
-                return parseCalc(
+                return toPx(
                     end || (viewport = (1 - viewport) * 100) && (viewport + "vh+" + viewport + "%"),
-                    this.target
+                    'height',
+                    this.target,
+                    true
                 );
             }
 
@@ -11098,19 +11152,6 @@
 
     };
 
-    var calcRe = /-?\d+(?:\.\d+)?(?:v[wh]|%|px)?/g;
-    function parseCalc(calc, el) {
-        var match;
-        var result = 0;
-        calc = calc.toString().replace(/\s/g, '');
-        calcRe.lastIndex = 0;
-        while ((match = calcRe.exec(calc)) !== null) {
-            result += toPx(match, 'height', el, true);
-        }
-
-        return result;
-    }
-
     function ease(percent, easing) {
         return easing >= 0
             ? Math.pow(percent, easing + 1)
@@ -11160,10 +11201,10 @@
 
         var from = prev
             ? getLeft(prev, list, center)
-            : getLeft(next, list, center) + dimensions(next).width * dir;
+            : getLeft(next, list, center) + dimensions$1(next).width * dir;
         var to = next
             ? getLeft(next, list, center)
-            : from + dimensions(prev).width * dir * (isRtl ? -1 : 1);
+            : from + dimensions$1(prev).width * dir * (isRtl ? -1 : 1);
 
         return {
 
@@ -11212,7 +11253,7 @@
                 css(list, 'transform', translate(clamp(
                     -to + (distance - distance * percent),
                     -getWidth(list),
-                    dimensions(list).width
+                    dimensions$1(list).width
                 ) * (isRtl ? -1 : 1), 'px'));
 
                 var actives = this.getActives();
@@ -11285,30 +11326,30 @@
     }
 
     function getMax(list) {
-        return Math.max(0, getWidth(list) - dimensions(list).width);
+        return Math.max(0, getWidth(list) - dimensions$1(list).width);
     }
 
     function getWidth(list) {
-        return children(list).reduce(function (right, el) { return dimensions(el).width + right; }, 0);
+        return children(list).reduce(function (right, el) { return dimensions$1(el).width + right; }, 0);
     }
 
     function centerEl(el, list) {
-        return dimensions(list).width / 2 - dimensions(el).width / 2;
+        return dimensions$1(list).width / 2 - dimensions$1(el).width / 2;
     }
 
     function getElLeft(el, list) {
-        return el && (position(el).left + (isRtl ? dimensions(el).width - dimensions(list).width : 0)) * (isRtl ? -1 : 1) || 0;
+        return el && (position(el).left + (isRtl ? dimensions$1(el).width - dimensions$1(list).width : 0)) * (isRtl ? -1 : 1) || 0;
     }
 
     function inView(list, listLeft) {
 
         listLeft -= 1;
-        var listWidth = dimensions(list).width;
+        var listWidth = dimensions$1(list).width;
         var listRight = listLeft + listWidth + 2;
 
         return children(list).filter(function (slide) {
             var slideLeft = getElLeft(slide, list);
-            var slideRight = slideLeft + Math.min(dimensions(slide).width, listWidth);
+            var slideRight = slideLeft + Math.min(dimensions$1(slide).width, listWidth);
 
             return slideLeft >= listLeft && slideRight <= listRight;
         });
@@ -11346,7 +11387,7 @@
             finite: function(ref) {
                 var finite = ref.finite;
 
-                return finite || Math.ceil(getWidth(this.list)) < dimensions(this.list).width + getMaxElWidth(this.list) + this.center;
+                return finite || Math.ceil(getWidth(this.list)) < Math.floor(dimensions$1(this.list).width + getMaxElWidth(this.list) + this.center);
             },
 
             maxIndex: function() {
@@ -11367,7 +11408,7 @@
                         return true;
                     }
 
-                    lft += dimensions(el).width;
+                    lft += dimensions$1(el).width;
 
                 });
 
@@ -11383,7 +11424,7 @@
                     return;
                 }
 
-                var width = dimensions(this.list).width / (this.center ? 2 : 1);
+                var width = dimensions$1(this.list).width / (this.center ? 2 : 1);
 
                 var left = 0;
                 var leftCenter = width;
@@ -11391,7 +11432,7 @@
 
                 sets = sortBy$1(this.slides, 'offsetLeft').reduce(function (sets, slide, i) {
 
-                    var slideWidth = dimensions(slide).width;
+                    var slideWidth = dimensions$1(slide).width;
                     var slideRight = slideLeft + slideWidth;
 
                     if (slideRight > left) {
@@ -11403,7 +11444,7 @@
                         if (!includes(sets, i)) {
 
                             var cmp = this$1$1.slides[i + 1];
-                            if (this$1$1.center && cmp && slideWidth < leftCenter - dimensions(cmp).width / 2) {
+                            if (this$1$1.center && cmp && slideWidth < leftCenter - dimensions$1(cmp).width / 2) {
                                 leftCenter -= slideWidth;
                             } else {
                                 leftCenter = width;
@@ -11491,7 +11532,7 @@
                 }
 
                 var index = this.dir < 0 || !this.slides[this.prevIndex] ? this.index : this.prevIndex;
-                this.duration = speedUp(this.avgWidth / this.velocity) * (dimensions(this.slides[index]).width / this.avgWidth);
+                this.duration = speedUp(this.avgWidth / this.velocity) * (dimensions$1(this.slides[index]).width / this.avgWidth);
 
                 this.reorder();
 
@@ -11531,7 +11572,7 @@
                 }
 
                 var next = this.slides[index];
-                var width = dimensions(this.list).width / 2 - dimensions(next).width / 2;
+                var width = dimensions$1(this.list).width / 2 - dimensions$1(next).width / 2;
                 var j = 0;
 
                 while (width > 0) {
@@ -11539,7 +11580,7 @@
                     var slide = this.slides[slideIndex];
 
                     css(slide, 'order', slideIndex > index ? -2 : -1);
-                    width -= dimensions(slide).width;
+                    width -= dimensions$1(slide).width;
                 }
 
             },
@@ -11576,7 +11617,7 @@
     };
 
     function getMaxElWidth(list) {
-        return Math.max.apply(Math, [ 0 ].concat( children(list).map(function (el) { return dimensions(el).width; }) ));
+        return Math.max.apply(Math, [ 0 ].concat( children(list).map(function (el) { return dimensions$1(el).width; }) ));
     }
 
     var sliderParallax = {
@@ -12090,7 +12131,6 @@
 
                 off(document, pointerMove, this.move);
                 off(document, pointerUp, this.end);
-                off(window, 'scroll', this.scroll);
 
                 if (!this.drag) {
                     return;
@@ -12173,7 +12213,7 @@
 
             var x = pos.x;
             var y = pos.y;
-            y += window.pageYOffset;
+            y += scrollTop(window);
 
             var dist = (Date.now() - last) * .3;
             last = Date.now();