From 79f86f2fe0f687a89199c7a6156dc0b1677ec2d8 Mon Sep 17 00:00:00 2001 From: Eric Rowell Date: Sun, 12 Jan 2014 21:48:33 -0800 Subject: [PATCH] fixed pattern scale default issue --- src/Shape.js | 4 ++-- test/unit/Shape-test.js | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/src/Shape.js b/src/Shape.js index c7bbeb4e..327631c4 100644 --- a/src/Shape.js +++ b/src/Shape.js @@ -1141,7 +1141,7 @@ */ - Kinetic.Factory.addGetterSetter(Kinetic.Shape, 'fillPatternScaleX', 0); + Kinetic.Factory.addGetterSetter(Kinetic.Shape, 'fillPatternScaleX', 1); /** * get/set fill pattern scale x * @name fillPatternScaleX @@ -1157,7 +1157,7 @@ * shape.fillPatternScaleX(2); */ - Kinetic.Factory.addGetterSetter(Kinetic.Shape, 'fillPatternScaleY', 0); + Kinetic.Factory.addGetterSetter(Kinetic.Shape, 'fillPatternScaleY', 1); /** * get/set fill pattern scale y * @name fillPatternScaleY diff --git a/test/unit/Shape-test.js b/test/unit/Shape-test.js index 5b900166..4bf7e333 100644 --- a/test/unit/Shape-test.js +++ b/test/unit/Shape-test.js @@ -575,4 +575,45 @@ suite('Shape', function() { assert.notEqual(Kinetic.Shape.prototype.getDashArray, undefined); }); + test('test defaults', function() { + var shape = new Kinetic.Shape(); + + assert.equal(shape.strokeRed(), 0); + assert.equal(shape.strokeGreen(), 0); + assert.equal(shape.strokeBlue(), 0); + assert.equal(shape.strokeWidth(), 2); + assert.equal(shape.shadowRed(), 0); + assert.equal(shape.shadowGreen(), 0); + assert.equal(shape.shadowBlue(), 0); + assert.equal(shape.shadowOffsetX(), 0); + assert.equal(shape.shadowOffsetY(), 0); + assert.equal(shape.fillRed(), 0); + assert.equal(shape.fillGreen(), 0); + assert.equal(shape.fillBlue(), 0); + assert.equal(shape.fillPatternX(), 0); + assert.equal(shape.fillPatternY(), 0); + assert.equal(shape.fillRadialGradientStartRadius(), 0); + assert.equal(shape.fillRadialGradientEndRadius(), 0); + assert.equal(shape.fillPatternRepeat(), 'repeat'); + assert.equal(shape.fillEnabled(), true); + assert.equal(shape.strokeEnabled(), true); + assert.equal(shape.shadowEnabled(), true); + assert.equal(shape.dashEnabled(), true); + assert.equal(shape.strokeScaleEnabled(), true); + assert.equal(shape.fillPriority(), 'color'); + assert.equal(shape.fillPatternOffsetX(), 0); + assert.equal(shape.fillPatternOffsetY(), 0); + assert.equal(shape.fillPatternScaleX(), 1); + assert.equal(shape.fillPatternScaleY(), 1); + assert.equal(shape.fillLinearGradientStartPointX(), 0); + assert.equal(shape.fillLinearGradientStartPointY(), 0); + assert.equal(shape.fillLinearGradientEndPointX(), 0); + assert.equal(shape.fillLinearGradientEndPointY(), 0); + assert.equal(shape.fillRadialGradientStartPointX(), 0); + assert.equal(shape.fillRadialGradientStartPointY(), 0); + assert.equal(shape.fillRadialGradientEndPointX(), 0); + assert.equal(shape.fillRadialGradientEndPointY(), 0); + assert.equal(shape.fillPatternRotation(), 0); + }); + }); \ No newline at end of file