aboutsummaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorfriendica <redmatrix@redmatrix.me>2015-04-28 13:14:40 -0700
committerfriendica <redmatrix@redmatrix.me>2015-04-28 13:14:40 -0700
commitbc44b6f793c686255ab1c6d2e18a6dbe754b6b96 (patch)
treee472d1c350fc994e6424463f9f05a2bb0aff31dd /library
parent8711c223f32b234a69c4cc76ce14030172384bc8 (diff)
parenta4ffbe77c7f08e4e99b1be6b579ac3da33a0c223 (diff)
downloadvolse-hubzilla-bc44b6f793c686255ab1c6d2e18a6dbe754b6b96.tar.gz
volse-hubzilla-bc44b6f793c686255ab1c6d2e18a6dbe754b6b96.tar.bz2
volse-hubzilla-bc44b6f793c686255ab1c6d2e18a6dbe754b6b96.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'library')
-rw-r--r--library/justifiedGallery/jquery.justifiedGallery.js7
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