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

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}