Skip to content

Commit 97dd3d0

Browse files
committed
πŸ”” merge flickity-imagesloaded into master proper
remove flickity-imagesloaded package βœ… test imagesloaded
1 parent eff50d6 commit 97dd3d0

File tree

9 files changed

+151
-218
lines changed

9 files changed

+151
-218
lines changed

β€Žjs/imagesloaded.jsβ€Ž

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// imagesloaded
2+
( function( window, factory ) {
3+
// universal module definition
4+
if ( typeof module == 'object' && module.exports ) {
5+
// CommonJS
6+
module.exports = factory(
7+
require('./core'),
8+
require('imagesloaded'),
9+
);
10+
} else {
11+
// browser global
12+
factory(
13+
window.Flickity,
14+
window.imagesLoaded,
15+
);
16+
}
17+
18+
}( typeof window != 'undefined' ? window : this,
19+
function factory( Flickity, imagesLoaded ) {
20+
21+
Flickity.create.imagesLoaded = function() {
22+
this.on( 'activate', this.imagesLoaded );
23+
};
24+
25+
Flickity.prototype.imagesLoaded = function() {
26+
if ( !this.options.imagesLoaded ) return;
27+
28+
let onImagesLoadedProgress = ( instance, image ) => {
29+
let cell = this.getParentCell( image.img );
30+
this.cellSizeChange( cell && cell.element );
31+
if ( !this.options.freeScroll ) this.positionSliderAtSelected();
32+
};
33+
imagesLoaded( this.slider ).on( 'progress', onImagesLoadedProgress );
34+
};
35+
36+
return Flickity;
37+
38+
} ) );

β€Žjs/index.jsβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ if ( typeof module == 'object' && module.exports ) {
1717
require('./player');
1818
require('./add-remove-cell');
1919
require('./lazyload');
20+
require('./imagesloaded');
2021

2122
module.exports = Flickity;
2223
}

β€Žpackage-lock.jsonβ€Ž

Lines changed: 9 additions & 197 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žpackage.jsonβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
"ev-emitter": "^2.1.2",
2121
"fizzy-ui-utils": "^3.0.0",
2222
"get-size": "^3.0.0",
23+
"imagesloaded": "^5.0.0",
2324
"unidragger": "^3.0.0"
2425
},
2526
"devDependencies": {
2627
"clean-css": "^5.2.2",
2728
"eslint": "^8.10.0",
2829
"eslint-plugin-metafizzy": "^2.0.1",
29-
"flickity-imagesloaded": "^2.0.0",
3030
"jquery-bridget": "^3.0.1",
3131
"qunit": "^2.17.2",
3232
"stylelint": "^14.2.0",

β€Žsandbox/ajax.htmlβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ <h1>ajax</h1>
3939
<script src="../js/page-dots.js"></script>
4040
<script src="../js/player.js"></script>
4141
<script src="../js/add-remove-cell.js"></script>
42-
<script src="../node_modules/flickity-imagesloaded/flickity-imagesloaded.js"></script>
42+
<script src="../js/imagesloaded.js"></script>
4343

4444
<script>
4545
window.onajaxload = function({ items }) {
@@ -51,7 +51,7 @@ <h1>ajax</h1>
5151
new Flickity( gallery, {
5252
freeScroll: true,
5353
friction: 0.2,
54-
// imagesLoaded: true,
54+
imagesLoaded: true,
5555
prevNextButtons: false,
5656
pageDots: false,
5757
wrapAround: true

0 commit comments

Comments
Β (0)