harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source
This commit is contained in:
friendica 2015-04-28 13:14:40 -07:00
commit bc44b6f793
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install/INSTALL.txt
View File

@ -17,7 +17,7 @@ with your hosting provider prior to installation. (And preferably before
entering into a long-term contract.) entering into a long-term contract.)
If you encounter installation issues, please let us know via the Github issue 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 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 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 in the future. Due to the large variety of operating systems and PHP platforms

7
library/justifiedGallery/jquery.justifiedGallery.js
View File

@ -45,8 +45,7 @@
target : null, // rewrite the target of all links target : null, // rewrite the target of all links
extension : /\.[^.\\/]+$/, extension : /\.[^.\\/]+$/,
refreshTime : 100, refreshTime : 100,
randomize : false, randomize : false
ignoreElement: null // a comma seperated list of div element selectors to be ignored e.g.: '.someClass, #someId'
}; };
function getSuffix(width, height, context) { function getSuffix(width, height, context) {
@ -572,8 +571,6 @@
var border = extendedSettings.border >= 0 ? extendedSettings.border : extendedSettings.margins; var border = extendedSettings.border >= 0 ? extendedSettings.border : extendedSettings.margins;
var ignoreElement = extendedSettings.ignoreElement;
//Context init //Context init
context = { context = {
settings : extendedSettings, settings : extendedSettings,
@ -622,7 +619,7 @@
checkSettings(context); 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; if (context.entries.length === 0) return;
// Randomize // Randomize

1
view/js/main.js
View File

@ -743,7 +743,6 @@ function justifyPhotos() {
$('#photo-album-contents').justifiedGallery({ $('#photo-album-contents').justifiedGallery({
margins: 3, margins: 3,
border: 0, border: 0,
ignoreElement: '#page-end',
sizeRangeSuffixes: { sizeRangeSuffixes: {
'lt100': '-2', 'lt100': '-2',
'lt240': '-2', 'lt240': '-2',