diff options
| author | friendica <info@friendica.com> | 2014-09-13 16:09:07 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-13 16:09:07 -0700 |
| commit | 5f4bcc4ef2b8f9cb2fd4a1f191f5f8465c194d63 (patch) | |
| tree | 9331eef0220ee70d662e848face0db1d44496ee7 /library/justifiedGallery/dist/js/jquery.justifiedGallery.js | |
| parent | 0350b76d851977ccd6eed4278738346f0febbf96 (diff) | |
| parent | 969f2530ccbd1586b6286f51159398ce0c88f4ca (diff) | |
| download | volse-hubzilla-5f4bcc4ef2b8f9cb2fd4a1f191f5f8465c194d63.tar.gz volse-hubzilla-5f4bcc4ef2b8f9cb2fd4a1f191f5f8465c194d63.tar.bz2 volse-hubzilla-5f4bcc4ef2b8f9cb2fd4a1f191f5f8465c194d63.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'library/justifiedGallery/dist/js/jquery.justifiedGallery.js')
| -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; |