uikit 3.15.18-dev.0512dbf39 → 3.15.18-dev.9cbbb510d
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 +2 -0
- 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 +1 -1
- package/dist/js/components/parallax.min.js +1 -1
- package/dist/js/components/slider-parallax.js +1 -1
- package/dist/js/components/slider-parallax.min.js +1 -1
- package/dist/js/components/slider.js +1 -1
- package/dist/js/components/slider.min.js +1 -1
- package/dist/js/components/slideshow-parallax.js +1 -1
- 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 +1 -1
- 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 +25 -7
- 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 +25 -7
- package/dist/js/uikit.min.js +1 -1
- package/package.json +1 -1
- package/src/js/core/sticky.js +23 -5
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "uikit",
|
|
3
3
|
"title": "UIkit",
|
|
4
4
|
"description": "UIkit is a lightweight and modular front-end framework for developing fast and powerful web interfaces.",
|
|
5
|
-
"version": "3.15.18-dev.
|
|
5
|
+
"version": "3.15.18-dev.9cbbb510d",
|
|
6
6
|
"main": "dist/js/uikit.js",
|
|
7
7
|
"style": "dist/css/uikit.css",
|
|
8
8
|
"sideEffects": [
|
package/src/js/core/sticky.js
CHANGED
|
@@ -98,7 +98,7 @@ export default {
|
|
|
98
98
|
this.hide();
|
|
99
99
|
removeClass(this.selTarget, this.clsInactive);
|
|
100
100
|
}
|
|
101
|
-
|
|
101
|
+
reset(this.$el);
|
|
102
102
|
|
|
103
103
|
remove(this.placeholder);
|
|
104
104
|
this.placeholder = null;
|
|
@@ -156,10 +156,10 @@ export default {
|
|
|
156
156
|
this.inactive = !this.matchMedia || !isVisible(this.$el);
|
|
157
157
|
|
|
158
158
|
if (this.inactive) {
|
|
159
|
-
return
|
|
159
|
+
return;
|
|
160
160
|
}
|
|
161
161
|
|
|
162
|
-
const hide = this.isFixed && types.has('resize');
|
|
162
|
+
const hide = this.isFixed && types.has('resize') && !sticky;
|
|
163
163
|
if (hide) {
|
|
164
164
|
css(this.selTarget, 'transition', '0s');
|
|
165
165
|
this.hide();
|
|
@@ -210,6 +210,7 @@ export default {
|
|
|
210
210
|
);
|
|
211
211
|
|
|
212
212
|
sticky =
|
|
213
|
+
maxScrollHeight &&
|
|
213
214
|
!this.showOnUp &&
|
|
214
215
|
start + offset === topOffset &&
|
|
215
216
|
end ===
|
|
@@ -225,6 +226,7 @@ export default {
|
|
|
225
226
|
overflow,
|
|
226
227
|
topOffset,
|
|
227
228
|
height,
|
|
229
|
+
elHeight,
|
|
228
230
|
width,
|
|
229
231
|
margin,
|
|
230
232
|
top: offsetPosition(referenceElement)[0],
|
|
@@ -233,9 +235,16 @@ export default {
|
|
|
233
235
|
},
|
|
234
236
|
|
|
235
237
|
write({ height, width, margin, offset, sticky }) {
|
|
238
|
+
if (this.inactive) {
|
|
239
|
+
reset(this.$el);
|
|
240
|
+
return;
|
|
241
|
+
}
|
|
242
|
+
|
|
236
243
|
if (sticky) {
|
|
237
244
|
height = width = margin = 0;
|
|
238
245
|
css(this.$el, { position: 'sticky', top: offset });
|
|
246
|
+
} else if (!this.isFixed) {
|
|
247
|
+
reset(this.$el);
|
|
239
248
|
}
|
|
240
249
|
const { placeholder } = this;
|
|
241
250
|
|
|
@@ -349,7 +358,7 @@ export default {
|
|
|
349
358
|
}
|
|
350
359
|
},
|
|
351
360
|
|
|
352
|
-
events: ['resize', 'scroll'],
|
|
361
|
+
events: ['resize', 'resizeViewport', 'scroll'],
|
|
353
362
|
},
|
|
354
363
|
],
|
|
355
364
|
|
|
@@ -389,6 +398,7 @@ export default {
|
|
|
389
398
|
offset,
|
|
390
399
|
topOffset,
|
|
391
400
|
height,
|
|
401
|
+
elHeight,
|
|
392
402
|
offsetParentTop,
|
|
393
403
|
sticky,
|
|
394
404
|
} = this._data;
|
|
@@ -416,7 +426,11 @@ export default {
|
|
|
416
426
|
css(this.$el, 'top', offset);
|
|
417
427
|
|
|
418
428
|
this.setActive(active);
|
|
419
|
-
toggleClass(
|
|
429
|
+
toggleClass(
|
|
430
|
+
this.$el,
|
|
431
|
+
this.clsBelow,
|
|
432
|
+
scroll > topOffset + (sticky ? Math.min(height, elHeight) : height)
|
|
433
|
+
);
|
|
420
434
|
addClass(this.$el, this.clsFixed);
|
|
421
435
|
},
|
|
422
436
|
|
|
@@ -460,3 +474,7 @@ function coerce(value) {
|
|
|
460
474
|
}
|
|
461
475
|
return value;
|
|
462
476
|
}
|
|
477
|
+
|
|
478
|
+
function reset(el) {
|
|
479
|
+
css(el, { position: '', top: '', marginTop: '', width: '' });
|
|
480
|
+
}
|