diff options
| author | friendica <redmatrix@redmatrix.me> | 2015-04-28 13:14:40 -0700 |
|---|---|---|
| committer | friendica <redmatrix@redmatrix.me> | 2015-04-28 13:14:40 -0700 |
| commit | bc44b6f793c686255ab1c6d2e18a6dbe754b6b96 (patch) | |
| tree | e472d1c350fc994e6424463f9f05a2bb0aff31dd | |
| parent | 8711c223f32b234a69c4cc76ce14030172384bc8 (diff) | |
| parent | a4ffbe77c7f08e4e99b1be6b579ac3da33a0c223 (diff) | |
| download | volse-hubzilla-bc44b6f793c686255ab1c6d2e18a6dbe754b6b96.tar.gz volse-hubzilla-bc44b6f793c686255ab1c6d2e18a6dbe754b6b96.tar.bz2 volse-hubzilla-bc44b6f793c686255ab1c6d2e18a6dbe754b6b96.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
| -rw-r--r-- | install/INSTALL.txt | 2 | ||||
| -rw-r--r-- | library/justifiedGallery/jquery.justifiedGallery.js | 7 | ||||
| -rw-r--r-- | view/js/main.js | 1 |
3 files changed, 3 insertions, 7 deletions
diff --git a/install/INSTALL.txt b/install/INSTALL.txt index 58ec365cb..a00c3bca3 100644 --- a/install/INSTALL.txt +++ b/install/INSTALL.txt @@ -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 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 diff --git a/view/js/main.js b/view/js/main.js index d1e61dc24..35944e13f 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -743,7 +743,6 @@ function justifyPhotos() { $('#photo-album-contents').justifiedGallery({ margins: 3, border: 0, - ignoreElement: '#page-end', sizeRangeSuffixes: { 'lt100': '-2', 'lt240': '-2', |