aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2011-04-08 14:24:13 +0000
committerpatdenice <patdenice@piwigo.org>2011-04-08 14:24:13 +0000
commita77a5a645d794927773d3bfb3b80f6cadf398441 (patch)
tree2bfeb46b7c6bd3d3ae4a4cb54c0ad12fbfa6592e
parentb02bee229506b6c23a31d2e5345fecdadd1f7634 (diff)
merge r10164 from trunk to branch 2.2
feature:2238 Bug corrected with Chrome (function is loaded later) git-svn-id: http://piwigo.org/svn/branches/2.2@10166 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/themes/default/template/batch_manager_global.tpl6
1 files changed, 4 insertions, 2 deletions
diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl
index 603877992..28b84869c 100644
--- a/admin/themes/default/template/batch_manager_global.tpl
+++ b/admin/themes/default/template/batch_manager_global.tpl
@@ -300,6 +300,10 @@ $(document).ready(function() {
return false;
});
+ checkPermitAction()
+});
+
+jQuery(window).load(function() {
var max_dim = 20;
$(".thumbnails img").each(function () {
if ($(this).height() > (max_dim-20))
@@ -308,8 +312,6 @@ $(document).ready(function() {
max_dim = $(this).width() + 20;
$("ul.thumbnails span, ul.thumbnails label").css('width', max_dim+'px').css('height', max_dim+'px');
});
-
- checkPermitAction()
});
{/literal}{/footer_script}