diff options
| author | friendica <info@friendica.com> | 2015-04-29 21:49:43 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-04-29 21:49:43 -0700 |
| commit | c4221f32738dac51f691d5be1bebd2b50318521e (patch) | |
| tree | e353242b42ca2942d7fe6d29888568c8bfe821ee /library | |
| parent | 6679734135fb04f4a7beccb81663bf1e9574f062 (diff) | |
| parent | 2376d2140ab6eeb8a44d7582a52978520844e229 (diff) | |
| download | volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.tar.gz volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.tar.bz2 volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.zip | |
Merge branch 'master' into tres
Conflicts:
include/notifier.php
Diffstat (limited to 'library')
| -rw-r--r-- | library/justifiedGallery/jquery.justifiedGallery.js | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/library/justifiedGallery/jquery.justifiedGallery.js b/library/justifiedGallery/jquery.justifiedGallery.js index 21679c96d..213a7f286 100644 --- a/library/justifiedGallery/jquery.justifiedGallery.js +++ b/library/justifiedGallery/jquery.justifiedGallery.js @@ -45,8 +45,7 @@ target : null, // rewrite the target of all links extension : /\.[^.\\/]+$/, refreshTime : 100, - randomize : false, - ignoreElement: null // a comma seperated list of div element selectors to be ignored e.g.: '.someClass, #someId' + randomize : false }; function getSuffix(width, height, context) { @@ -572,8 +571,6 @@ var border = extendedSettings.border >= 0 ? extendedSettings.border : extendedSettings.margins; - var ignoreElement = extendedSettings.ignoreElement; - //Context init context = { settings : extendedSettings, @@ -622,7 +619,7 @@ checkSettings(context); - context.entries = $gallery.find('> a, > div:not(.spinner, ' + ignoreElement + ')').toArray(); + context.entries = $gallery.find('> a, > div:not(.spinner, #page-end)').toArray(); if (context.entries.length === 0) return; // Randomize |