When rejectSmallImage is false, allow small image to be zoomed down to 1

Chyren0305 · Jun 18, 2015 · 869a63e · 869a63e
1 parent c747c79
commit 869a63e
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/dist/jquery.cropit.js b/dist/jquery.cropit.js
@@ -602,7 +602,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	        previewSize: this.previewSize,
 	        exportZoom: this.options.exportZoom,
 	        maxZoom: this.options.maxZoom,
-	        minZoom: this.options.minZoom
+	        minZoom: this.options.minZoom,
+	        rejectSmallImage: this.options.rejectSmallImage
 	      });
 	      this.setZoom((0, _utils.exists)(zoom) ? zoom : this.zoom);
 
@@ -819,6 +820,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	      var maxZoom = _ref$maxZoom === undefined ? 1 : _ref$maxZoom;
 	      var _ref$minZoom = _ref.minZoom;
 	      var minZoom = _ref$minZoom === undefined ? 'fill' : _ref$minZoom;
+	      var _ref$rejectSmallImage = _ref.rejectSmallImage;
+	      var rejectSmallImage = _ref$rejectSmallImage === undefined ? false : _ref$rejectSmallImage;
 
 	      var widthRatio = previewSize.w / imageSize.w;
 	      var heightRatio = previewSize.h / imageSize.h;
@@ -829,6 +832,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	        this.minZoom = Math.max(widthRatio, heightRatio);
 	      }
 
+	      if (!rejectSmallImage) {
+	        this.minZoom = Math.min(this.minZoom, 1);
+	      }
+
 	      this.maxZoom = Math.max(this.minZoom, maxZoom / exportZoom);
 	    }
 	  }, {

diff --git a/src/cropit.js b/src/cropit.js
@@ -352,6 +352,7 @@ class Cropit {
       exportZoom: this.options.exportZoom,
       maxZoom: this.options.maxZoom,
       minZoom: this.options.minZoom,
+      rejectSmallImage: this.options.rejectSmallImage,
     });
     this.setZoom(exists(zoom) ? zoom : this.zoom);
 

diff --git a/src/zoomer.js b/src/zoomer.js
@@ -3,7 +3,7 @@ class Zoomer {
     this.minZoom = this.maxZoom = 1;
   }
 
-  setup({ imageSize, previewSize, exportZoom=1, maxZoom=1, minZoom='fill' }) {
+  setup({ imageSize, previewSize, exportZoom=1, maxZoom=1, minZoom='fill', rejectSmallImage=false }) {
     const widthRatio = previewSize.w / imageSize.w;
     const heightRatio = previewSize.h / imageSize.h;
 
@@ -14,6 +14,10 @@ class Zoomer {
       this.minZoom = Math.max(widthRatio, heightRatio);
     }
 
+    if (!rejectSmallImage) {
+      this.minZoom = Math.min(this.minZoom, 1);
+    }
+
     this.maxZoom = Math.max(this.minZoom, maxZoom / exportZoom);
   }
 

diff --git a/test/zoomer.spec.js b/test/zoomer.spec.js
@@ -18,18 +18,21 @@ describe('Zoomer', () => {
       zoomer.setup({
         imageSize: { w: 4, h: 2 },
         previewSize: { w: 1, h: 1 },
+        minZoom: 'fill',
       });
       expect(zoomer.minZoom).toBe(0.5);
 
       zoomer.setup({
         imageSize: { w: 2, h: 4 },
         previewSize: { w: 1, h: 1 },
+        minZoom: 'fill',
       });
       expect(zoomer.minZoom).toBe(0.5);
 
       zoomer.setup({
         imageSize: { w: 2, h: 2 },
         previewSize: { w: 1, h: 1 },
+        minZoom: 'fill',
       });
       expect(zoomer.minZoom).toBe(0.5);
     });
@@ -57,6 +60,23 @@ describe('Zoomer', () => {
       expect(zoomer.minZoom).toBe(0.5);
     });
 
+    it('sets minZoom to 1 if image is small and rejectSmallImage is false', () => {
+      zoomer.setup({
+        imageSize: { w: 1, h: 1 },
+        previewSize: { w: 2, h: 2 },
+        rejectSmallImage: false,
+      });
+      expect(zoomer.minZoom).toBe(1);
+
+      zoomer.setup({
+        imageSize: { w: 1, h: 3 },
+        previewSize: { w: 2, h: 2 },
+        minZoom: 'fill',
+        rejectSmallImage: false,
+      });
+      expect(zoomer.minZoom).toBe(1);
+    });
+
     it('sets maxZoom to minZoom if image is smaller than preview', () => {
       zoomer.setup({
         imageSize: { w: 4, h: 2 },