uikit 3.11.0 → 3.11.2-dev.0e5febb2b
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +25 -0
- package/build/scope.js +4 -6
- package/dist/css/uikit-core-rtl.css +1 -1
- package/dist/css/uikit-core-rtl.min.css +1 -1
- package/dist/css/uikit-core.css +1 -1
- package/dist/css/uikit-core.min.css +1 -1
- package/dist/css/uikit-rtl.css +1 -1
- package/dist/css/uikit-rtl.min.css +1 -1
- package/dist/css/uikit.css +1 -1
- package/dist/css/uikit.min.css +1 -1
- package/dist/js/components/countdown.js +1 -1
- package/dist/js/components/countdown.min.js +1 -1
- package/dist/js/components/filter.js +1 -1
- package/dist/js/components/filter.min.js +1 -1
- package/dist/js/components/lightbox-panel.js +1 -1
- package/dist/js/components/lightbox-panel.min.js +1 -1
- package/dist/js/components/lightbox.js +1 -1
- package/dist/js/components/lightbox.min.js +1 -1
- package/dist/js/components/notification.js +1 -1
- package/dist/js/components/notification.min.js +1 -1
- package/dist/js/components/parallax.js +37 -41
- package/dist/js/components/parallax.min.js +1 -1
- package/dist/js/components/slider-parallax.js +32 -25
- package/dist/js/components/slider-parallax.min.js +1 -1
- package/dist/js/components/slider.js +2 -2
- package/dist/js/components/slider.min.js +1 -1
- package/dist/js/components/slideshow-parallax.js +32 -25
- package/dist/js/components/slideshow-parallax.min.js +1 -1
- package/dist/js/components/slideshow.js +1 -1
- package/dist/js/components/slideshow.min.js +1 -1
- package/dist/js/components/sortable.js +2 -3
- package/dist/js/components/sortable.min.js +1 -1
- package/dist/js/components/tooltip.js +1 -1
- package/dist/js/components/tooltip.min.js +1 -1
- package/dist/js/components/upload.js +1 -1
- package/dist/js/components/upload.min.js +1 -1
- package/dist/js/uikit-core.js +169 -102
- package/dist/js/uikit-core.min.js +1 -1
- package/dist/js/uikit-icons.js +1 -1
- package/dist/js/uikit-icons.min.js +1 -1
- package/dist/js/uikit.js +232 -170
- package/dist/js/uikit.min.js +1 -1
- package/package.json +1 -1
- package/src/js/api/component.js +1 -1
- package/src/js/api/state.js +20 -24
- package/src/js/components/parallax.js +5 -16
- package/src/js/components/slider.js +1 -1
- package/src/js/components/sortable.js +1 -2
- package/src/js/core/core.js +2 -2
- package/src/js/core/drop.js +1 -1
- package/src/js/core/height-viewport.js +2 -2
- package/src/js/core/navbar.js +6 -2
- package/src/js/core/sticky.js +82 -50
- package/src/js/mixin/parallax.js +32 -21
- package/src/js/util/dimensions.js +28 -12
- package/src/js/util/fastdom.js +2 -2
- package/src/js/util/viewport.js +7 -3
- package/tests/sticky-parallax.html +44 -41
- package/tests/sticky.html +56 -24
package/dist/js/uikit-core.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/*! UIkit 3.11.
|
|
1
|
+
/*! UIkit 3.11.2-dev.0e5febb2b | https://www.getuikit.com | (c) 2014 - 2022 YOOtheme | MIT License */
|
|
2
2
|
|
|
3
3
|
(function (global, factory) {
|
|
4
4
|
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
|
|
@@ -1750,19 +1750,35 @@
|
|
|
1750
1750
|
if ( element === void 0 ) element = window;
|
|
1751
1751
|
if ( offsetDim === void 0 ) offsetDim = false;
|
|
1752
1752
|
|
|
1753
|
-
|
|
1754
|
-
|
|
1755
|
-
|
|
1756
|
-
|
|
1757
|
-
|
|
1758
|
-
|
|
1759
|
-
|
|
1760
|
-
|
|
1761
|
-
|
|
1762
|
-
|
|
1763
|
-
|
|
1753
|
+
|
|
1754
|
+
if (!isString(value)) {
|
|
1755
|
+
return toFloat(value);
|
|
1756
|
+
}
|
|
1757
|
+
|
|
1758
|
+
return parseCalc(value).reduce(function (result, value) {
|
|
1759
|
+
var unit = parseUnit(value);
|
|
1760
|
+
if (unit) {
|
|
1761
|
+
value = percent(
|
|
1762
|
+
unit === 'vh'
|
|
1763
|
+
? height(toWindow(element))
|
|
1764
|
+
: unit === 'vw'
|
|
1765
|
+
? width(toWindow(element))
|
|
1766
|
+
: offsetDim
|
|
1767
|
+
? element[("offset" + (ucfirst(property)))]
|
|
1768
|
+
: dimensions(element)[property],
|
|
1769
|
+
value
|
|
1770
|
+
);
|
|
1771
|
+
}
|
|
1772
|
+
|
|
1773
|
+
return result + toFloat(value);
|
|
1774
|
+
}, 0);
|
|
1764
1775
|
}
|
|
1765
1776
|
|
|
1777
|
+
var calcRe = /-?\d+(?:\.\d+)?(?:v[wh]|%|px)?/g;
|
|
1778
|
+
var parseCalc = memoize(function (calc) { return calc.toString().replace(/\s/g, '').match(calcRe) || []; });
|
|
1779
|
+
var unitRe = /(?:v[hw]|%)$/;
|
|
1780
|
+
var parseUnit = memoize(function (str) { return (str.match(unitRe) || [])[0]; });
|
|
1781
|
+
|
|
1766
1782
|
function percent(base, value) {
|
|
1767
1783
|
return base * toFloat(value) / 100;
|
|
1768
1784
|
}
|
|
@@ -1800,8 +1816,6 @@
|
|
|
1800
1816
|
};
|
|
1801
1817
|
|
|
1802
1818
|
function flush(recursion) {
|
|
1803
|
-
if ( recursion === void 0 ) recursion = 1;
|
|
1804
|
-
|
|
1805
1819
|
runTasks(fastdom.reads);
|
|
1806
1820
|
runTasks(fastdom.writes.splice(0));
|
|
1807
1821
|
|
|
@@ -1823,7 +1837,7 @@
|
|
|
1823
1837
|
if (recursion && recursion < RECURSION_LIMIT) {
|
|
1824
1838
|
Promise$1.resolve().then(function () { return flush(recursion); });
|
|
1825
1839
|
} else {
|
|
1826
|
-
requestAnimationFrame(function () { return flush(); });
|
|
1840
|
+
requestAnimationFrame(function () { return flush(1); });
|
|
1827
1841
|
}
|
|
1828
1842
|
|
|
1829
1843
|
}
|
|
@@ -2241,7 +2255,11 @@
|
|
|
2241
2255
|
element = toNode(element);
|
|
2242
2256
|
}
|
|
2243
2257
|
|
|
2244
|
-
|
|
2258
|
+
if (isUndefined(top)) {
|
|
2259
|
+
return element.scrollTop;
|
|
2260
|
+
} else {
|
|
2261
|
+
element.scrollTop = top;
|
|
2262
|
+
}
|
|
2245
2263
|
}
|
|
2246
2264
|
|
|
2247
2265
|
function scrollIntoView(element, ref) {
|
|
@@ -2673,7 +2691,8 @@
|
|
|
2673
2691
|
scrolledOver: scrolledOver,
|
|
2674
2692
|
scrollParents: scrollParents,
|
|
2675
2693
|
getViewport: getViewport$1,
|
|
2676
|
-
getViewportClientHeight: getViewportClientHeight
|
|
2694
|
+
getViewportClientHeight: getViewportClientHeight,
|
|
2695
|
+
getScrollingElement: getScrollingElement
|
|
2677
2696
|
});
|
|
2678
2697
|
|
|
2679
2698
|
function globalAPI (UIkit) {
|
|
@@ -3137,11 +3156,11 @@
|
|
|
3137
3156
|
on(
|
|
3138
3157
|
el,
|
|
3139
3158
|
name,
|
|
3140
|
-
|
|
3141
|
-
?
|
|
3142
|
-
: isString(delegate)
|
|
3159
|
+
delegate
|
|
3160
|
+
? isString(delegate)
|
|
3143
3161
|
? delegate
|
|
3144
|
-
: delegate.call(component)
|
|
3162
|
+
: delegate.call(component)
|
|
3163
|
+
: null,
|
|
3145
3164
|
isString(handler) ? component[handler] : handler.bind(component),
|
|
3146
3165
|
{passive: passive, capture: capture, self: self}
|
|
3147
3166
|
)
|
|
@@ -3177,30 +3196,26 @@
|
|
|
3177
3196
|
}
|
|
3178
3197
|
|
|
3179
3198
|
function normalizeData(ref, ref$1) {
|
|
3180
|
-
var data = ref.data;
|
|
3181
|
-
var args = ref$1.args;
|
|
3199
|
+
var data = ref.data; if ( data === void 0 ) data = {};
|
|
3200
|
+
var args = ref$1.args; if ( args === void 0 ) args = [];
|
|
3182
3201
|
var props = ref$1.props; if ( props === void 0 ) props = {};
|
|
3183
3202
|
|
|
3184
|
-
|
|
3185
|
-
|
|
3186
|
-
|
|
3187
|
-
|
|
3188
|
-
assign(data, value);
|
|
3189
|
-
} else {
|
|
3190
|
-
data[args[index]] = value;
|
|
3191
|
-
}
|
|
3192
|
-
return data;
|
|
3193
|
-
}, {})
|
|
3194
|
-
: undefined
|
|
3195
|
-
: data;
|
|
3196
|
-
|
|
3197
|
-
if (data) {
|
|
3198
|
-
for (var key in data) {
|
|
3199
|
-
if (isUndefined(data[key])) {
|
|
3200
|
-
delete data[key];
|
|
3203
|
+
if (isArray(data)) {
|
|
3204
|
+
data = data.slice(0, args.length).reduce(function (data, value, index) {
|
|
3205
|
+
if (isPlainObject(value)) {
|
|
3206
|
+
assign(data, value);
|
|
3201
3207
|
} else {
|
|
3202
|
-
data[
|
|
3208
|
+
data[args[index]] = value;
|
|
3203
3209
|
}
|
|
3210
|
+
return data;
|
|
3211
|
+
}, {});
|
|
3212
|
+
}
|
|
3213
|
+
|
|
3214
|
+
for (var key in data) {
|
|
3215
|
+
if (isUndefined(data[key])) {
|
|
3216
|
+
delete data[key];
|
|
3217
|
+
} else if (props[key]) {
|
|
3218
|
+
data[key] = coerce(props[key], data[key]);
|
|
3204
3219
|
}
|
|
3205
3220
|
}
|
|
3206
3221
|
|
|
@@ -3382,7 +3397,7 @@
|
|
|
3382
3397
|
|
|
3383
3398
|
return component.options.functional
|
|
3384
3399
|
? new component({data: isPlainObject(element) ? element : [].concat( argsArray )})
|
|
3385
|
-
:
|
|
3400
|
+
: element ? $$(element).map(init)[0] : init();
|
|
3386
3401
|
|
|
3387
3402
|
function init(element) {
|
|
3388
3403
|
|
|
@@ -3462,7 +3477,7 @@
|
|
|
3462
3477
|
UIkit.data = '__uikit__';
|
|
3463
3478
|
UIkit.prefix = 'uk-';
|
|
3464
3479
|
UIkit.options = {};
|
|
3465
|
-
UIkit.version = '3.11.
|
|
3480
|
+
UIkit.version = '3.11.2-dev.0e5febb2b';
|
|
3466
3481
|
|
|
3467
3482
|
globalAPI(UIkit);
|
|
3468
3483
|
hooksAPI(UIkit);
|
|
@@ -3483,7 +3498,7 @@
|
|
|
3483
3498
|
return;
|
|
3484
3499
|
}
|
|
3485
3500
|
pendingResize = true;
|
|
3486
|
-
fastdom.
|
|
3501
|
+
fastdom.read(function () { return pendingResize = false; });
|
|
3487
3502
|
UIkit.update(null, 'resize');
|
|
3488
3503
|
};
|
|
3489
3504
|
|
|
@@ -3502,7 +3517,7 @@
|
|
|
3502
3517
|
return;
|
|
3503
3518
|
}
|
|
3504
3519
|
pending = true;
|
|
3505
|
-
fastdom.
|
|
3520
|
+
fastdom.read(function () { return pending = false; });
|
|
3506
3521
|
|
|
3507
3522
|
UIkit.update(null, e.type);
|
|
3508
3523
|
|
|
@@ -4588,7 +4603,7 @@
|
|
|
4588
4603
|
if (active$1) {
|
|
4589
4604
|
|
|
4590
4605
|
if (delay && active$1.isDelaying) {
|
|
4591
|
-
this.showTimer = setTimeout(this.show, 10);
|
|
4606
|
+
this.showTimer = setTimeout(function () { return matches(target, ':hover') && this$1$1.show(); }, 10);
|
|
4592
4607
|
return;
|
|
4593
4608
|
}
|
|
4594
4609
|
|
|
@@ -5312,7 +5327,7 @@
|
|
|
5312
5327
|
css(this.$el, {minHeight: minHeight});
|
|
5313
5328
|
|
|
5314
5329
|
if (minHeight !== prev) {
|
|
5315
|
-
|
|
5330
|
+
trigger(this.$el, 'resize');
|
|
5316
5331
|
}
|
|
5317
5332
|
|
|
5318
5333
|
if (this.minHeight && toFloat(css(this.$el, 'minHeight')) < this.minHeight) {
|
|
@@ -6720,7 +6735,7 @@
|
|
|
6720
6735
|
var current = ref.current;
|
|
6721
6736
|
|
|
6722
6737
|
var active = this.getActive();
|
|
6723
|
-
if (active && includes(active.mode, 'hover') && active.target && !within(active.target, current) && !active.
|
|
6738
|
+
if (active && includes(active.mode, 'hover') && active.target && !within(active.target, current) && !active.isDelaying) {
|
|
6724
6739
|
active.hide(false);
|
|
6725
6740
|
}
|
|
6726
6741
|
}
|
|
@@ -6895,7 +6910,11 @@
|
|
|
6895
6910
|
|
|
6896
6911
|
var active = this.getActive();
|
|
6897
6912
|
|
|
6898
|
-
if (matches(this.dropbar, ':hover')
|
|
6913
|
+
if (matches(this.dropbar, ':hover')
|
|
6914
|
+
&& active
|
|
6915
|
+
&& active.$el === $el
|
|
6916
|
+
&& !this.toggles.some(function (el) { return active.target !== el && matches(el, ':focus'); })
|
|
6917
|
+
) {
|
|
6899
6918
|
e.preventDefault();
|
|
6900
6919
|
}
|
|
6901
6920
|
}
|
|
@@ -7687,6 +7706,7 @@
|
|
|
7687
7706
|
mixins: [Class, Media],
|
|
7688
7707
|
|
|
7689
7708
|
props: {
|
|
7709
|
+
position: String,
|
|
7690
7710
|
top: null,
|
|
7691
7711
|
bottom: Boolean,
|
|
7692
7712
|
offset: String,
|
|
@@ -7702,6 +7722,7 @@
|
|
|
7702
7722
|
},
|
|
7703
7723
|
|
|
7704
7724
|
data: {
|
|
7725
|
+
position: 'top',
|
|
7705
7726
|
top: 0,
|
|
7706
7727
|
bottom: false,
|
|
7707
7728
|
offset: 0,
|
|
@@ -7718,10 +7739,23 @@
|
|
|
7718
7739
|
|
|
7719
7740
|
computed: {
|
|
7720
7741
|
|
|
7721
|
-
|
|
7742
|
+
position: function(ref, $el) {
|
|
7743
|
+
var position = ref.position;
|
|
7744
|
+
|
|
7745
|
+
return position === 'auto'
|
|
7746
|
+
? (this.isFixed ? this.placeholder : $el).offsetHeight > height(window)
|
|
7747
|
+
? 'bottom'
|
|
7748
|
+
: 'top'
|
|
7749
|
+
: position;
|
|
7750
|
+
},
|
|
7751
|
+
|
|
7752
|
+
offset: function(ref, $el) {
|
|
7722
7753
|
var offset = ref.offset;
|
|
7723
7754
|
|
|
7724
|
-
|
|
7755
|
+
if (this.position === 'bottom') {
|
|
7756
|
+
offset += '+100vh-100%';
|
|
7757
|
+
}
|
|
7758
|
+
return toPx(offset, 'height', $el);
|
|
7725
7759
|
},
|
|
7726
7760
|
|
|
7727
7761
|
selTarget: function(ref, $el) {
|
|
@@ -7788,7 +7822,7 @@
|
|
|
7788
7822
|
var this$1$1 = this;
|
|
7789
7823
|
|
|
7790
7824
|
|
|
7791
|
-
if (!(this.targetOffset !== false && location.hash && window
|
|
7825
|
+
if (!(this.targetOffset !== false && location.hash && scrollTop(window) > 0)) {
|
|
7792
7826
|
return;
|
|
7793
7827
|
}
|
|
7794
7828
|
|
|
@@ -7821,6 +7855,7 @@
|
|
|
7821
7855
|
|
|
7822
7856
|
read: function(ref, types) {
|
|
7823
7857
|
var height$1 = ref.height;
|
|
7858
|
+
var margin = ref.margin;
|
|
7824
7859
|
|
|
7825
7860
|
|
|
7826
7861
|
this.inactive = !this.matchMedia || !isVisible(this.$el);
|
|
@@ -7829,46 +7864,56 @@
|
|
|
7829
7864
|
return false;
|
|
7830
7865
|
}
|
|
7831
7866
|
|
|
7832
|
-
|
|
7867
|
+
var hide = this.isActive && types.has('resize');
|
|
7868
|
+
if (hide) {
|
|
7833
7869
|
this.hide();
|
|
7834
|
-
height$1 = this.$el.offsetHeight;
|
|
7835
|
-
this.show();
|
|
7836
7870
|
}
|
|
7837
7871
|
|
|
7838
|
-
|
|
7872
|
+
if (!this.isActive) {
|
|
7873
|
+
height$1 = this.$el.offsetHeight;
|
|
7874
|
+
margin = css(this.$el, 'margin');
|
|
7875
|
+
}
|
|
7839
7876
|
|
|
7840
|
-
if (
|
|
7841
|
-
this.
|
|
7842
|
-
return false;
|
|
7877
|
+
if (hide) {
|
|
7878
|
+
this.show();
|
|
7843
7879
|
}
|
|
7844
7880
|
|
|
7881
|
+
var overflow = Math.max(0, height$1 + this.offset - height(window));
|
|
7882
|
+
|
|
7845
7883
|
var referenceElement = this.isFixed ? this.placeholder : this.$el;
|
|
7846
|
-
|
|
7847
|
-
|
|
7848
|
-
this.offsetParentTop = offset(referenceElement.offsetParent).top;
|
|
7884
|
+
var topOffset = offset(referenceElement).top;
|
|
7885
|
+
var offsetParentTop = offset(referenceElement.offsetParent).top;
|
|
7849
7886
|
|
|
7850
|
-
var
|
|
7887
|
+
var top = parseProp(this.top, this.$el, topOffset);
|
|
7888
|
+
var bottom = parseProp(this.bottom, this.$el, topOffset + height$1);
|
|
7851
7889
|
|
|
7852
|
-
|
|
7853
|
-
|
|
7854
|
-
|
|
7890
|
+
var start = Math.max(top, topOffset) - this.offset;
|
|
7891
|
+
var end = bottom
|
|
7892
|
+
? bottom - this.$el.offsetHeight + overflow - this.offset
|
|
7893
|
+
: getScrollingElement(this.$el).scrollHeight - height(window);
|
|
7855
7894
|
|
|
7856
7895
|
return {
|
|
7896
|
+
start: start,
|
|
7897
|
+
end: end,
|
|
7898
|
+
overflow: overflow,
|
|
7899
|
+
topOffset: topOffset,
|
|
7900
|
+
offsetParentTop: offsetParentTop,
|
|
7857
7901
|
height: height$1,
|
|
7858
|
-
|
|
7859
|
-
|
|
7902
|
+
margin: margin,
|
|
7903
|
+
width: dimensions(isVisible(this.widthElement) ? this.widthElement : this.$el).width,
|
|
7904
|
+
top: offsetPosition(this.placeholder)[0]
|
|
7860
7905
|
};
|
|
7861
7906
|
},
|
|
7862
7907
|
|
|
7863
7908
|
write: function(ref) {
|
|
7864
7909
|
var height = ref.height;
|
|
7865
|
-
var
|
|
7910
|
+
var margin = ref.margin;
|
|
7866
7911
|
|
|
7867
7912
|
|
|
7868
7913
|
var ref$1 = this;
|
|
7869
7914
|
var placeholder = ref$1.placeholder;
|
|
7870
7915
|
|
|
7871
|
-
css(placeholder,
|
|
7916
|
+
css(placeholder, {height: height, margin: margin});
|
|
7872
7917
|
|
|
7873
7918
|
if (!within(placeholder, document)) {
|
|
7874
7919
|
after(this.$el, placeholder);
|
|
@@ -7886,14 +7931,29 @@
|
|
|
7886
7931
|
{
|
|
7887
7932
|
|
|
7888
7933
|
read: function(ref) {
|
|
7889
|
-
var
|
|
7934
|
+
var prevScroll = ref.scroll; if ( prevScroll === void 0 ) prevScroll = 0;
|
|
7935
|
+
var prevDir = ref.dir; if ( prevDir === void 0 ) prevDir = 'down';
|
|
7936
|
+
var overflow = ref.overflow;
|
|
7937
|
+
var overflowScroll = ref.overflowScroll; if ( overflowScroll === void 0 ) overflowScroll = 0;
|
|
7938
|
+
var start = ref.start;
|
|
7939
|
+
var end = ref.end;
|
|
7890
7940
|
|
|
7891
7941
|
|
|
7892
|
-
|
|
7942
|
+
var scroll = scrollTop(window);
|
|
7943
|
+
var dir = prevScroll <= scroll ? 'down' : 'up';
|
|
7893
7944
|
|
|
7894
7945
|
return {
|
|
7895
|
-
dir:
|
|
7896
|
-
|
|
7946
|
+
dir: dir,
|
|
7947
|
+
prevDir: prevDir,
|
|
7948
|
+
scroll: scroll,
|
|
7949
|
+
prevScroll: prevScroll,
|
|
7950
|
+
overflowScroll: clamp(
|
|
7951
|
+
overflowScroll
|
|
7952
|
+
+ clamp(scroll, start, end)
|
|
7953
|
+
- clamp(prevScroll, start, end),
|
|
7954
|
+
0,
|
|
7955
|
+
overflow
|
|
7956
|
+
)
|
|
7897
7957
|
};
|
|
7898
7958
|
},
|
|
7899
7959
|
|
|
@@ -7901,35 +7961,34 @@
|
|
|
7901
7961
|
var this$1$1 = this;
|
|
7902
7962
|
|
|
7903
7963
|
|
|
7904
|
-
var now = Date.now();
|
|
7905
7964
|
var isScrollUpdate = types.has('scroll');
|
|
7906
7965
|
var initTimestamp = data.initTimestamp; if ( initTimestamp === void 0 ) initTimestamp = 0;
|
|
7907
7966
|
var dir = data.dir;
|
|
7908
|
-
var
|
|
7909
|
-
var lastScroll = data.lastScroll;
|
|
7967
|
+
var prevDir = data.prevDir;
|
|
7910
7968
|
var scroll = data.scroll;
|
|
7969
|
+
var prevScroll = data.prevScroll; if ( prevScroll === void 0 ) prevScroll = 0;
|
|
7911
7970
|
var top = data.top;
|
|
7971
|
+
var start = data.start;
|
|
7972
|
+
var topOffset = data.topOffset;
|
|
7973
|
+
var height = data.height;
|
|
7912
7974
|
|
|
7913
|
-
|
|
7914
|
-
|
|
7915
|
-
if (scroll < 0 || scroll === lastScroll && isScrollUpdate || this.showOnUp && !isScrollUpdate && !this.isFixed) {
|
|
7975
|
+
if (scroll < 0 || scroll === prevScroll && isScrollUpdate || this.showOnUp && !isScrollUpdate && !this.isFixed) {
|
|
7916
7976
|
return;
|
|
7917
7977
|
}
|
|
7918
7978
|
|
|
7919
|
-
|
|
7979
|
+
var now = Date.now();
|
|
7980
|
+
if (now - initTimestamp > 300 || dir !== prevDir) {
|
|
7920
7981
|
data.initScroll = scroll;
|
|
7921
7982
|
data.initTimestamp = now;
|
|
7922
7983
|
}
|
|
7923
7984
|
|
|
7924
|
-
data.
|
|
7925
|
-
|
|
7926
|
-
if (this.showOnUp && !this.isFixed && Math.abs(data.initScroll - scroll) <= 30 && Math.abs(lastScroll - scroll) <= 10) {
|
|
7985
|
+
if (this.showOnUp && !this.isFixed && Math.abs(data.initScroll - scroll) <= 30 && Math.abs(prevScroll - scroll) <= 10) {
|
|
7927
7986
|
return;
|
|
7928
7987
|
}
|
|
7929
7988
|
|
|
7930
7989
|
if (this.inactive
|
|
7931
|
-
|| scroll <
|
|
7932
|
-
|| this.showOnUp && (scroll <=
|
|
7990
|
+
|| scroll < start
|
|
7991
|
+
|| this.showOnUp && (scroll <= start || dir === 'down' && isScrollUpdate || dir === 'up' && !this.isFixed && scroll <= topOffset + height)
|
|
7933
7992
|
) {
|
|
7934
7993
|
|
|
7935
7994
|
if (!this.isFixed) {
|
|
@@ -7944,7 +8003,7 @@
|
|
|
7944
8003
|
|
|
7945
8004
|
this.isFixed = false;
|
|
7946
8005
|
|
|
7947
|
-
if (this.animation && scroll >
|
|
8006
|
+
if (this.animation && scroll > topOffset) {
|
|
7948
8007
|
Animation.cancel(this.$el);
|
|
7949
8008
|
Animation.out(this.$el, this.animation).then(function () { return this$1$1.hide(); }, noop);
|
|
7950
8009
|
} else {
|
|
@@ -7994,23 +8053,37 @@
|
|
|
7994
8053
|
|
|
7995
8054
|
update: function() {
|
|
7996
8055
|
|
|
7997
|
-
var
|
|
7998
|
-
var
|
|
8056
|
+
var ref = this._data;
|
|
8057
|
+
var width = ref.width;
|
|
8058
|
+
var scroll = ref.scroll; if ( scroll === void 0 ) scroll = 0;
|
|
8059
|
+
var overflow = ref.overflow;
|
|
8060
|
+
var overflowScroll = ref.overflowScroll; if ( overflowScroll === void 0 ) overflowScroll = 0;
|
|
8061
|
+
var start = ref.start;
|
|
8062
|
+
var end = ref.end;
|
|
8063
|
+
var topOffset = ref.topOffset;
|
|
8064
|
+
var height = ref.height;
|
|
8065
|
+
var offsetParentTop = ref.offsetParentTop;
|
|
8066
|
+
var active = start !== 0 || scroll > start;
|
|
8067
|
+
var top = this.offset;
|
|
7999
8068
|
var position = 'fixed';
|
|
8000
8069
|
|
|
8001
|
-
if (
|
|
8002
|
-
top = this.
|
|
8070
|
+
if (scroll > end) {
|
|
8071
|
+
top = end + this.offset - offsetParentTop;
|
|
8003
8072
|
position = 'absolute';
|
|
8004
8073
|
}
|
|
8005
8074
|
|
|
8075
|
+
if (overflow) {
|
|
8076
|
+
top -= overflowScroll;
|
|
8077
|
+
}
|
|
8078
|
+
|
|
8006
8079
|
css(this.$el, {
|
|
8007
8080
|
position: position,
|
|
8008
8081
|
top: (top + "px"),
|
|
8009
|
-
width:
|
|
8082
|
+
width: width
|
|
8010
8083
|
});
|
|
8011
8084
|
|
|
8012
8085
|
this.isActive = active;
|
|
8013
|
-
toggleClass(this.$el, this.clsBelow,
|
|
8086
|
+
toggleClass(this.$el, this.clsBelow, scroll > topOffset + height);
|
|
8014
8087
|
addClass(this.$el, this.clsFixed);
|
|
8015
8088
|
|
|
8016
8089
|
}
|
|
@@ -8019,16 +8092,10 @@
|
|
|
8019
8092
|
|
|
8020
8093
|
};
|
|
8021
8094
|
|
|
8022
|
-
function parseProp(
|
|
8023
|
-
var $props = ref.$props;
|
|
8024
|
-
var $el = ref.$el;
|
|
8025
|
-
var propOffset = ref[(prop + "Offset")];
|
|
8026
|
-
|
|
8027
|
-
|
|
8028
|
-
var value = $props[prop];
|
|
8095
|
+
function parseProp(value, el, propOffset) {
|
|
8029
8096
|
|
|
8030
8097
|
if (!value) {
|
|
8031
|
-
return;
|
|
8098
|
+
return 0;
|
|
8032
8099
|
}
|
|
8033
8100
|
|
|
8034
8101
|
if (isString(value) && value.match(/^-?\d/)) {
|
|
@@ -8037,7 +8104,7 @@
|
|
|
8037
8104
|
|
|
8038
8105
|
} else {
|
|
8039
8106
|
|
|
8040
|
-
return offset(value === true ? parent(
|
|
8107
|
+
return offset(value === true ? parent(el) : query(value, el)).bottom;
|
|
8041
8108
|
|
|
8042
8109
|
}
|
|
8043
8110
|
}
|