Changeset 12696 for extensions/GThumb

Timestamp:

Dec 5, 2011, 7:13:13 PM (12 years ago)

Author:

patdenice

Message:

Bug corrected with smaller thumbnails than normal size.

Location:

extensions/GThumb

Files:

• admin.php (modified) (2 diffs)
• js/gthumb.js (modified) (5 diffs)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• template/gthumb.tpl (modified) (1 diff)

extensions/GThumb/admin.php

@@ -13 +13 @@
 if (isset($_GET['deletecache']))
 {
-  check_pwg_token();
+  check_pwg_token();                             
   gtdeltree(GTHUMB_CACHE_DIR);
   redirect('admin.php?page=plugin-GThumb');
@@ -77 +77 @@
 $template->assign(
   array(
-    'NB_ELEMENTS' => l10n_dec('%d photo', '%d photos', $data['nb_files']),
+    'NB_ELEMENTS' => l10n_dec('%d file', '%d files', $data['nb_files']),
     'ELEMENTS_SIZE' => $data['size'],
     'PWG_TOKEN' => get_pwg_token(),

extensions/GThumb/js/gthumb.js

@@ -13 +13 @@
     queue: true,  
     cacheResponse: false,
-    maxRequests: 2,
+    maxRequests: 3,
     preventDoubleRequests: false
   }),
@@ -24 +24 @@
       width = parseInt(jQuery(this).attr('width'));
       height = parseInt(jQuery(this).attr('height'));
-      GThumb.t.push({id:id,width:width,height:height});
+      th = {id:id,width:width,height:height,real_width:width,real_height:height};
+      if (height < GThumb.max_height) {
+        th.width = Math.round(GThumb.max_height * width / height);
+        th.height = GThumb.max_height;
+      }
+      GThumb.t.push(th);
 
       if (jQuery(this).attr('src') == '') {
@@ -164 +169 @@
             new_width = Math.round(new_width);
           }
-          this.resize(jQuery('#gt'+thumb_process[j].id), thumb_process[j].width, thumb_process[j].height, new_width, new_height, false);
+          this.resize(jQuery('#gt'+thumb_process[j].id), thumb_process[j].real_width, thumb_process[j].real_height, new_width, new_height, false);
 
           width_count += new_width + this.margin;
@@ -177 +182 @@
     // Last line does not need to be cropped
     for (j=0;j<thumb_process.length;j++) {
-      this.resize(jQuery('#gt'+thumb_process[j].id), thumb_process[j].width, thumb_process[j].height, thumb_process[j].width, max_height, false);
+      this.resize(jQuery('#gt'+thumb_process[j].id), thumb_process[j].real_width, thumb_process[j].real_height, thumb_process[j].width, max_height, false);
     }
 
@@ -187 +192 @@
   resize: function(thumb, width, height, new_width, new_height, is_big) {
 
-    if (this.method == 'resize') {
-      real_width = Math.min(new_width, width);
-      real_height = Math.min(new_height, height);
+    if (this.method == 'resize' || height < new_height || width < new_width) {
+      real_width = new_width;
+      real_height = new_height;
       width_crop = 0;
       height_crop = 0;

extensions/GThumb/language/en_UK/plugin.lang.php

@@ -8 +8 @@
 $lang['Cache Informations'] = 'Cache Informations';
 $lang['Clear the cache'] = 'Clear the cache';
+$lang['%d file'] = '%d file';
+$lang['%d files'] = '%d files';
 
 ?>

extensions/GThumb/language/fr_FR/plugin.lang.php

@@ -8 +8 @@
 $lang['Cache Informations'] = 'Informations du cache';
 $lang['Clear the cache'] = 'Effacer le cache';
+$lang['%d file'] = '%d fichier';
+$lang['%d files'] = '%d fichiers';
 
 ?>

extensions/GThumb/template/gthumb.tpl

@@ -18 +18 @@
 GThumb.margin = {$GThumb.margin};
 GThumb.method = '{$GThumb.method}';
+
+{if isset($big_thumb)}
 GThumb.small_thumb = {ldelim}id:{$small_thumb.id},src:'{$small_thumb.src}',width:{$small_thumb.width},height:{$small_thumb.height}{rdelim};
-{if isset($big_thumb)}
 GThumb.big_thumb = {ldelim}id:{$big_thumb.id},src:'{$big_thumb.src}',width:{$big_thumb.width},height:{$big_thumb.height}{rdelim};
 {/if}