From 4dfc65dba48a39c5ad2fc1c1efc9d22ac6e7188e Mon Sep 17 00:00:00 2001
From: lavrton <lavrton@gmail.com>
Date: Thu, 22 Jan 2015 15:46:53 +0700
Subject: [PATCH] limit corner radius

---
 CHANGELOG.md                  |  7 +++++++
 bower.json                    | 15 ++++++---------
 resources/bower-template.json | 13 +++++--------
 src/shapes/Rect.js            |  1 +
 test/unit/shapes/Rect-test.js | 26 ++++++++++++++++++++++++++
 5 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d45f1640..05eb0ffc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 5.2.1
+
+* Bug Fixes
+
+* Enhancements
+    * `cornerRadius` of Rect is limited by `width/2` and `height/2`
+
 ## 5.2.0 2014-01-22
 
 * Bug Fixes
diff --git a/bower.json b/bower.json
index 45dcfb0b..af9376bb 100644
--- a/bower.json
+++ b/bower.json
@@ -1,10 +1,10 @@
 {
   "name": "KineticJS",
-  "version": "5.2.0",
-  "homepage": "http://kineticjs.com/",
+  "version": "5.1.10",
   "authors": [
     "Eric Rowell", "Anton Lavrenov"
   ],
+  "homepage": "http://lavrton.github.io/KineticJS/",
   "description": "KineticJS is an HTML5 Canvas JavaScript framework that enables high performance animations, transitions, node nesting, layering, filtering, caching, event handling for desktop and mobile applications, and much more.",
   "keywords": [
     "canvas",
@@ -16,17 +16,14 @@
   "ignore": [
     "**/.*",
     "test",
-    "tests",
-    "doc-includes",
+    "resources",
     "src",
     "*.yml",
     ".jshitrc",
     ".npmignore",
+    ".travis.yml",
     ".gitignore",
-    "Gruntfile.js",
-    "bower-template.json",
-    "server.js",
-    "presentation-schedule.md"
+    "Gruntfile.js"
   ],
-  "main": "kinetic.js"
+  "main": "kinetic.min.js"
 }
diff --git a/resources/bower-template.json b/resources/bower-template.json
index a563a37a..5b68de4e 100644
--- a/resources/bower-template.json
+++ b/resources/bower-template.json
@@ -1,10 +1,10 @@
 {
   "name": "KineticJS",
   "version": "@@version",
-  "homepage": "http://kineticjs.com/",
   "authors": [
     "Eric Rowell", "Anton Lavrenov"
   ],
+  "homepage": "http://lavrton.github.io/KineticJS/",
   "description": "KineticJS is an HTML5 Canvas JavaScript framework that enables high performance animations, transitions, node nesting, layering, filtering, caching, event handling for desktop and mobile applications, and much more.",
   "keywords": [
     "canvas",
@@ -16,17 +16,14 @@
   "ignore": [
     "**/.*",
     "test",
-    "tests",
-    "doc-includes",
+    "resources",
     "src",
     "*.yml",
     ".jshitrc",
     ".npmignore",
+    ".travis.yml",
     ".gitignore",
-    "Gruntfile.js",
-    "bower-template.json",
-    "server.js",
-    "presentation-schedule.md"
+    "Gruntfile.js"
   ],
-  "main": "kinetic.js"
+  "main": "kinetic.min.js"
 }
diff --git a/src/shapes/Rect.js b/src/shapes/Rect.js
index 20a94af6..94516d87 100644
--- a/src/shapes/Rect.js
+++ b/src/shapes/Rect.js
@@ -41,6 +41,7 @@
             }
             else {
                 // arcTo would be nicer, but browser support is patchy (Opera)
+                cornerRadius = Math.min(cornerRadius, width / 2, height / 2);
                 context.moveTo(cornerRadius, 0);
                 context.lineTo(width - cornerRadius, 0);
                 context.arc(width - cornerRadius, cornerRadius, cornerRadius, Math.PI * 3 / 2, 0, false);
diff --git a/test/unit/shapes/Rect-test.js b/test/unit/shapes/Rect-test.js
index c5bdf5ac..7099d257 100644
--- a/test/unit/shapes/Rect-test.js
+++ b/test/unit/shapes/Rect-test.js
@@ -178,4 +178,30 @@ suite('Rect', function(){
       compareLayerAndCanvas(layer, canvas);
   });
 
+    // ======================================================
+    test('limit corner radius', function() {
+        var stage = addStage();
+        var layer = new Kinetic.Layer();
+        var rect = new Kinetic.Rect({
+            x: 50,
+            y: 50,
+            width: 100,
+            height: 100,
+            fill: 'black',
+            cornerRadius : 100
+        });
+
+        layer.add(rect);
+        stage.add(layer);
+
+        // as corner radius is much bigger we should have circe in the result
+        var canvas = createCanvas();
+        var context = canvas.getContext('2d');
+        context.beginPath();
+        context.arc(100, 100, 50, 0, Math.PI * 2);
+        context.fillStyle = 'black';
+        context.fill();
+        compareLayerAndCanvas(layer, canvas);
+    });
+
 });
\ No newline at end of file