Changeset 12691 for extensions/GThumb/js/gthumb.js

Timestamp:

Dec 3, 2011, 6:11:54 PM (12 years ago)

Author:

patdenice

Message:

Display cache informations on admin page.
Add possibility to clear the cache.
Resize method is now applied on big images.

File:

• extensions/GThumb/js/gthumb.js (modified) (5 diffs)

extensions/GThumb/js/gthumb.js

@@ -73 +73 @@
 
       // Compute best size for landscape picture (we choose bigger height)
-      min_ratio = Math.min(1, this.big_thumb.width/this.big_thumb.height);
+      min_ratio = Math.min(1.05, this.big_thumb.width/this.big_thumb.height);
 
       for(width = this.big_thumb.width; width/best_size.height>=min_ratio; width--) {
@@ -118 +118 @@
       }
       this.t[0].crop = best_size.width;
-      this.resize(first_thumb, this.big_thumb.width, this.big_thumb.height, best_size.width, best_size.height, 'crop');
+      this.resize(first_thumb, this.big_thumb.width, this.big_thumb.height, best_size.width, best_size.height, true);
 
     }
@@ -164 +164 @@
             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, this.method);
+          this.resize(jQuery('#gt'+thumb_process[j].id), thumb_process[j].width, thumb_process[j].height, new_width, new_height, false);
 
           width_count += new_width + this.margin;
@@ -177 +177 @@
     // 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, this.method);
+      this.resize(jQuery('#gt'+thumb_process[j].id), thumb_process[j].width, thumb_process[j].height, thumb_process[j].width, max_height, false);
     }
 
@@ -185 +185 @@
   },
 
-  resize: function(thumb, width, height, new_width, new_height, method) {
-
-    if (method == 'resize') {
+  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);
+      width_crop = 0;
+      height_crop = 0;
+
+      if (is_big) {
+        if (width - new_width > height - new_height) {
+          real_width = Math.round(new_height * width / height);
+          width_crop = Math.round((real_width - new_width)/2);
+        } else {
+          real_height = Math.round(new_width * height / width);
+          height_crop = Math.round((real_height - new_height)/2);
+        }
+      }
       thumb.css({
-        height: new_height+'px',
-        width: new_width+'px'
+        height: real_height+'px',
+        width: real_width+'px'
       });
-      height_crop = 0;
-      width_crop = 0;
     } else {
       thumb.css({height: '', width: ''});