archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Multisize

Browse source 
Bug fixed if $conf['derivative_url_style'] != 0
Create a pwg_ajax_thumbnails_loader function

git-svn-id: http://piwigo.org/svn/trunk@13452 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice 2012-03-01 16:26:55 +00:00
commit 54ce78ca76
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/derivative.inc.php
View file

@ -99,7 +99,7 @@ final class DerivativeImage
public $src_image;
private $params;
private $rel_path, $rel_url, $is_cached;
private $rel_path, $rel_url, $is_cached=true;
function __construct($type, $src_image)
{
@ -160,7 +160,6 @@ final class DerivativeImage
// todo - what if we have a watermark maybe return a smaller size?
$params = null;
$rel_path = $rel_url = $src->rel_path;
$is_cached = true;
return;
}
@ -197,7 +196,6 @@ final class DerivativeImage
}
else
{
$is_cached = true;
$url_style = 1;
}
}

13
themes/default/js/thumbnails.loader.js
View file

@ -21,9 +21,10 @@ function add_thumbnail_to_queue(img, loop) {
});
}
jQuery('img').each(function() {
var img = jQuery(this);
if (typeof img.data('src') != 'undefined') {
add_thumbnail_to_queue(img, 0);
}
});
function pwg_ajax_thumbnails_loader() {
jQuery('img[data-src]').each(function() {
add_thumbnail_to_queue(jQuery(this), 0);
});
}
jQuery(document).ready(pwg_ajax_thumbnails_loader);

4
themes/default/template/thumbnails.tpl
View file

@ -1,6 +1,6 @@
{if !empty($thumbnails)}{strip}
{combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='async'}
{combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='async'}
{combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'}
{combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'}
{*define_derivative name='derivative_params' width=160 height=90 crop=true*}
{html_style}
{*Set some sizes according to maximum thumbnail width and height*}