Wrap calculations for enforceBoundary: false in a conditional (#326)

* enclose fixing of data for enforceBoundary: false inside a conditional * minified version
Foliotek · May 24, 2017 · 05c8d08 · 05c8d08
1 parent cfd4d4d
commit 05c8d08
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/croppie.js b/croppie.js
@@ -979,22 +979,25 @@
             ctx.fillStyle = data.backgroundColor;
             ctx.fillRect(0, 0, outWidth, outHeight);
         }
+
         // start fixing data to send to draw image for enforceBoundary: false
-        if (left < 0) {
-            startX = Math.abs(left);
-            left = 0;
-        }
-        if (top < 0) {
-            startY = Math.abs(top);
-            top = 0;
-        }
-        if (right > self._originalImageWidth) {
-            width = self._originalImageWidth - left;
-            outWidth = width;
-        }
-        if (bottom > self._originalImageHeight) {
-            height = self._originalImageHeight - top;
-            outHeight = height;
+        if (!self.options.enforceBoundary) {
+            if (left < 0) {
+                startX = Math.abs(left);
+                left = 0;
+            }
+            if (top < 0) {
+                startY = Math.abs(top);
+                top = 0;
+            }
+            if (right > self._originalImageWidth) {
+                width = self._originalImageWidth - left;
+                outWidth = width;
+            }
+            if (bottom > self._originalImageHeight) {
+                height = self._originalImageHeight - top;
+                outHeight = height;
+            }
         }
 
         if (outputRatio !== 1) {
@@ -1163,8 +1166,7 @@
     var RESULT_DEFAULTS = {
             type: 'canvas',
             format: 'png',
-            quality: 1,
-            size: 'viewport'
+            quality: 1
         },
         RESULT_FORMATS = ['jpeg', 'webp', 'png'];