Merge https://github.com/redmatrix/redmatrix into pending_merge
This commit is contained in:
commit
bc44b6f793
@ -17,7 +17,7 @@ with your hosting provider prior to installation. (And preferably before
|
||||
entering into a long-term contract.)
|
||||
|
||||
If you encounter installation issues, please let us know via the Github issue
|
||||
tracker (https://github.com/friendica/red/issues). Please be as clear as you
|
||||
tracker (https://github.com/redmatrix/redmatrix/issues). Please be as clear as you
|
||||
can about your operating environment and provide as much detail as possible
|
||||
about any error messages you may see, so that we can prevent it from happening
|
||||
in the future. Due to the large variety of operating systems and PHP platforms
|
||||
|
@ -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
|
||||
|
@ -743,7 +743,6 @@ function justifyPhotos() {
|
||||
$('#photo-album-contents').justifiedGallery({
|
||||
margins: 3,
|
||||
border: 0,
|
||||
ignoreElement: '#page-end',
|
||||
sizeRangeSuffixes: {
|
||||
'lt100': '-2',
|
||||
'lt240': '-2',
|
||||
|
Reference in New Issue
Block a user