From ca2c673ccecd41e5178b8f1b934ed068ca9a387b Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Tue, 3 Apr 2018 16:05:02 +0200 Subject: [PATCH] fixed masonry for productions --- .../edlptheme/assets/dist/scripts/main.min.js | 13 ++++++++++--- .../themes/custom/edlptheme/assets/scripts/main.js | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js b/sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js index 446d7fb50..b5617afb3 100644 --- a/sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js +++ b/sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js @@ -684,7 +684,8 @@ $('
') .addClass('block random-player') .append(this.$btn) - .insertAfter('#block-userlogin, #block-studiolinkblock'); + // .insertAfter('#block-userlogin, #block-studiolinkblock'); + .prependTo('.region-footer-right'); // events this.$btn.on('click', this.toggleActive.bind(this)); @@ -1016,14 +1017,20 @@ horizontalOrder: true, containerStyle: null, // disable initial layout - initLayout: false, + // initLayout: false, }); // bind event // $grid.masonry( 'on', 'layoutComplete', function() { // console.log('layout is complete'); // }); + + // layout Masonry after each image loads + $grid.imagesLoaded().progress( function() { + $grid.masonry('layout'); + }); + $grid.imagesLoaded(function(){ - $grid.masonry(); + $grid.masonry('layout'); }); }; diff --git a/sites/all/themes/custom/edlptheme/assets/scripts/main.js b/sites/all/themes/custom/edlptheme/assets/scripts/main.js index 446d7fb50..b5617afb3 100644 --- a/sites/all/themes/custom/edlptheme/assets/scripts/main.js +++ b/sites/all/themes/custom/edlptheme/assets/scripts/main.js @@ -684,7 +684,8 @@ $('
') .addClass('block random-player') .append(this.$btn) - .insertAfter('#block-userlogin, #block-studiolinkblock'); + // .insertAfter('#block-userlogin, #block-studiolinkblock'); + .prependTo('.region-footer-right'); // events this.$btn.on('click', this.toggleActive.bind(this)); @@ -1016,14 +1017,20 @@ horizontalOrder: true, containerStyle: null, // disable initial layout - initLayout: false, + // initLayout: false, }); // bind event // $grid.masonry( 'on', 'layoutComplete', function() { // console.log('layout is complete'); // }); + + // layout Masonry after each image loads + $grid.imagesLoaded().progress( function() { + $grid.masonry('layout'); + }); + $grid.imagesLoaded(function(){ - $grid.masonry(); + $grid.masonry('layout'); }); };