diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2014-09-15 10:01:25 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2014-09-15 10:01:25 +0200 |
| commit | 4f793069bf4aafcfe77d50e47690173104ef23c7 (patch) | |
| tree | 7fe1bfcb18672300bf14967338690ea4fa51e640 /library/justifiedGallery | |
| parent | ed7f3001c1c1deec5076ae12114e5c42865b6251 (diff) | |
| parent | 58aad83e5cb0edaf1ccc543147030e782c5e7ba9 (diff) | |
| download | volse-hubzilla-4f793069bf4aafcfe77d50e47690173104ef23c7.tar.gz volse-hubzilla-4f793069bf4aafcfe77d50e47690173104ef23c7.tar.bz2 volse-hubzilla-4f793069bf4aafcfe77d50e47690173104ef23c7.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'library/justifiedGallery')
| -rw-r--r-- | library/justifiedGallery/dist/js/jquery.justifiedGallery.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/library/justifiedGallery/dist/js/jquery.justifiedGallery.js b/library/justifiedGallery/dist/js/jquery.justifiedGallery.js index 2c3eee11b..9b5c66081 100644 --- a/library/justifiedGallery/dist/js/jquery.justifiedGallery.js +++ b/library/justifiedGallery/dist/js/jquery.justifiedGallery.js @@ -444,6 +444,7 @@ } return this.each(function (index, gallery) { + var $gallery = $(gallery); $gallery.addClass('justified-gallery'); @@ -492,14 +493,13 @@ } else if (arg === 'norewind') { // In this case we don't rewind, and analyze all the images } else { - //redmatrix - this makes the gallery jump back to top after new content is loaded context.settings = $.extend({}, context.settings, arg); rewind(context); } checkSettings(context); - context.entries = $gallery.find('> a').toArray(); + context.entries = $gallery.find('> a, > div').toArray(); if (context.entries.length === 0) return; // Randomize @@ -533,6 +533,7 @@ //DEBUG// console.log('listed ' + $image.attr('alt')); imagesToLoad = true; + // Spinner start if (context.spinner.active === false) { context.spinner.active = true; |