allow size of square-like areas (width equals height) to be set with …

…a single numeric size value
SpinGo · Jul 29, 2014 · f377700 · f377700
1 parent 680558e
commit f377700
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/source/js/classes/crop-area-circle.js b/source/js/classes/crop-area-circle.js
@@ -90,11 +90,9 @@ crop.factory('cropAreaCircle', ['cropArea', function(CropArea) {
           iFR = this._posResizeStartSize.w + iFX*2;
         }
 
-        var diameter = Math.max(this._minSize.h, iFR);
-
         var prevCenter = this.getCenterPoint();
 
-        this.setSize({w: diameter, h: diameter});
+        this.setSize(Math.max(this._minSize.h, iFR));
 
         //recenter
         this.setCenterPoint(prevCenter);

diff --git a/source/js/classes/crop-area-square.js b/source/js/classes/crop-area-square.js
@@ -163,8 +163,7 @@ crop.factory('cropAreaSquare', ['cropArea', function(CropArea) {
       }
       var prevCenter = this.getCenterPoint();
 
-      var width = Math.max(this._minSize.w, iFR);
-      this.setSize({w: width, h: width});
+      this.setSize(Math.max(this._minSize.w, iFR));
 
       //recenter
       this.setCenterPoint(prevCenter);

diff --git a/source/js/classes/crop-area.js b/source/js/classes/crop-area.js
@@ -28,12 +28,7 @@ crop.factory('cropArea', ['cropCanvas', function(CropCanvas) {
 
   CropArea.prototype.setSize = function (size) {
 
-    //make this polymorphic to accept a single floating point number n , size.w = n, size.h = n
-    this._size = {x: Math.max(this._minSize.x, size.x) || this._minSize.x,
-                  y: Math.max(this._minSize.y, size.y) || this._minSize.y,
-                  w: Math.max(this._minSize.w, size.w) || this._minSize.w,
-                  h: Math.max(this._minSize.h, size.h) || this._minSize.h};
-
+    this._size = this._processSize(size);
     this._dontDragOutside();
   };
 
@@ -58,8 +53,8 @@ crop.factory('cropArea', ['cropCanvas', function(CropCanvas) {
   };
 
   CropArea.prototype.setMinSize = function (size) {
-    this._minSize = size;
-    this.setSize(size);
+    this._minSize = this._processSize(size);
+    this.setSize(this._minSize);
     this._dontDragOutside();
   };
 
@@ -91,6 +86,20 @@ crop.factory('cropArea', ['cropCanvas', function(CropCanvas) {
 
   CropArea.prototype._drawArea=function() {};
 
+  CropArea.prototype._processSize=function(size)
+  {
+    // make this polymorphic to accept a single floating point number
+    // for square-like sizes (including circle)
+    if (typeof size == "number")
+    {
+      size = {w: size, h: size};
+    }
+    return {x: Math.max(this._minSize.x, size.x) || this._minSize.x,
+            y: Math.max(this._minSize.y, size.y) || this._minSize.y,
+            w: Math.max(this._minSize.w, size.w) || this._minSize.w,
+            h: Math.max(this._minSize.h, size.h) || this._minSize.h};
+  }
+
   CropArea.prototype.draw=function() {
     // draw crop area
     this._cropCanvas.drawCropArea(this._image,this.getCenterPoint(),this._size,this._drawArea);