lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2026-01-18 19:51:21 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

changed fillStroke() to fillStrokeShape() for consistency

Browse Source
This commit is contained in:
Eric Rowell
2013-09-02 11:09:30 -07:00
parent 159959a077
commit c802935208
16 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Context.js
View File

@@ -59,6 +59,14 @@
return this.traceArr.join(';');
},
/**
* clear trace if trace is enabled
* @method
* @memberof Kinetic.Context.prototype
*/
clearTrace: function() {
this.traceArr = [];
},
_trace: function(str) {
var traceArr = this.traceArr,
len;
@@ -79,6 +87,12 @@
var pixelRatio = this.getCanvas().getPixelRatio();
this.setTransform(1 * pixelRatio, 0, 0, 1 * pixelRatio, 0, 0);
},
/**
* get canvas
* @method
* @memberof Kinetic.Context.prototype
* @returns {Kinetic.Canvas}
*/
getCanvas: function() {
return this.canvas;
},
@@ -123,14 +137,14 @@
}
},
/**
* fill, stroke, and apply shadows
* fill, stroke, and apply shadows to shape. Shadows
* will only be applied to either the fill or stroke.  Fill
* is given priority over stroke.
* @method
* @memberof Kinetic.Context.prototype
* @param {Kinetic.Shape} shape
*/
fillStroke: function(shape) {
fillStrokeShape: function(shape) {
var fillEnabled = shape.getFillEnabled();
if(fillEnabled) {
this._fill(shape);

2
src/plugins/Label.js
View File

@@ -218,7 +218,7 @@
}
_context.closePath();
context.fillStroke(this);
context.fillStrokeShape(this);
}
};

2
src/plugins/RegularPolygon.js
View File

@@ -45,7 +45,7 @@
_context.lineTo(x, y);
}
_context.closePath();
context.fillStroke(this);
context.fillStrokeShape(this);
}
};
Kinetic.Util.extend(Kinetic.RegularPolygon, Kinetic.Shape);

2
src/plugins/Star.js
View File

@@ -49,7 +49,7 @@
}
_context.closePath();
context.fillStroke(this);
context.fillStrokeShape(this);
}
};
Kinetic.Util.extend(Kinetic.Star, Kinetic.Shape);

2
src/plugins/TextPath.js
View File

@@ -85,7 +85,7 @@
_context.rotate(glyphInfo[i].rotation);
this.partialText = glyphInfo[i].text;
context.fillStroke(this);
context.fillStrokeShape(this);
_context.restore();
//// To assist with debugging visually, uncomment following

2
src/shapes/Blob.js
View File

@@ -66,7 +66,7 @@
}
_context.closePath();
context.fillStroke(this);
context.fillStrokeShape(this);
},
_setAllPoints: function() {
var points = this.getPoints(),

2
src/shapes/Circle.js
View File

@@ -45,7 +45,7 @@
context.beginPath();
context.arc(0, 0, this.getRadius(), 0, PIx2, false);
context.closePath();
context.fillStroke(this);
context.fillStrokeShape(this);
},
getWidth: function() {
return this.getRadius() * 2;

2
src/shapes/Ellipse.js
View File

@@ -34,7 +34,7 @@
_context.arc(0, 0, r.x, 0, PIx2, false);
_context.restore();
_context.closePath();
context.fillStroke(this);
context.fillStrokeShape(this);
},
getWidth: function() {
return this.getRadius().x * 2;

4
src/shapes/Image.js
View File

@@ -69,7 +69,7 @@
_context.beginPath();
_context.rect(0, 0, width, height);
_context.closePath();
context.fillStroke(this);
context.fillStrokeShape(this);
if(image) {
// if cropping
@@ -108,7 +108,7 @@
_context.beginPath();
_context.rect(0, 0, width, height);
_context.closePath();
context.fillStroke(this);
context.fillStrokeShape(this);
}
},
applyFilter: function() {

2
src/shapes/Polygon.js
View File

@@ -38,7 +38,7 @@
_context.lineTo(points[n].x, points[n].y);
}
_context.closePath();
context.fillStroke(this);
context.fillStrokeShape(this);
}
};
Kinetic.Util.extend(Kinetic.Polygon, Kinetic.Shape);

2
src/shapes/Rect.js
View File

@@ -50,7 +50,7 @@
context.arc(cornerRadius, cornerRadius, cornerRadius, Math.PI, Math.PI * 3 / 2, false);
}
context.closePath();
context.fillStroke(this);
context.fillStrokeShape(this);
}
};

4
src/shapes/Text.js
View File

@@ -125,7 +125,7 @@
}
this.partialText = text;
context.fillStroke(this);
context.fillStrokeShape(this);
_context.restore();
_context.translate(0, lineHeightPx);
}
@@ -139,7 +139,7 @@
_context.beginPath();
_context.rect(0, 0, width, height);
_context.closePath();
context.fillStroke(this);
context.fillStrokeShape(this);
},
/**
* set text

2
src/shapes/Wedge.js
View File

@@ -38,7 +38,7 @@
_context.arc(0, 0, this.getRadius(), 0, this.getAngle(), this.getClockwise());
_context.lineTo(0, 0);
_context.closePath();
context.fillStroke(this);
context.fillStrokeShape(this);
}
};
Kinetic.Util.extend(Kinetic.Wedge, Kinetic.Shape);

4
tests/js/functionalTests.js
View File

@@ -1414,7 +1414,7 @@ Test.Modules['HIT FUNCS'] = {
_context.beginPath();
_context.arc(0, 0, this.getRadius() + 100, 0, Math.PI * 2, true);
_context.closePath();
context.fillStroke(this);
context.fillStrokeShape(this);
}
});
@@ -1470,7 +1470,7 @@ Test.Modules['HIT FUNCS'] = {
_context.beginPath();
_context.arc(0, 0, this.getRadius() - 50, 0, Math.PI * 2, true);
_context.closePath();
context.fillStroke(this);
context.fillStrokeShape(this);
});

4
tests/js/unit/nodeTests.js
View File

@@ -2140,7 +2140,7 @@ Test.Modules.NODE = {
_context.lineTo(420, 80);
_context.quadraticCurveTo(300, 100, 260, 170);
_context.closePath();
context.fillStroke(this);
context.fillStrokeShape(this);
};
var triangle = new Kinetic.Shape({
drawFunc: drawTriangle,
@@ -2174,7 +2174,7 @@ Test.Modules.NODE = {
_context.lineTo(420, 80);
_context.quadraticCurveTo(300, 100, 260, 170);
_context.closePath();
context.fillStroke(this);
context.fillStrokeShape(this);
};
var json = '{"attrs":{"width":578,"height":200},"nodeType":"Stage","children":[{"attrs":{},"nodeType":"Layer","children":[{"attrs":{},"nodeType":"Group","children":[{"attrs":{"fill":"#00D2FF","stroke":"black","strokeWidth":4,"id":"myTriangle"},"nodeType":"Shape"}]}]}]}';

4
tests/js/unit/shapeTests.js
View File

@@ -135,7 +135,7 @@ Test.Modules.SHAPE = {
_context.lineTo(100, 0);
_context.lineTo(100, 100);
_context.closePath();
context.fillStroke(this);
context.fillStrokeShape(this);
},
x: 10,
y: 10,
@@ -172,7 +172,7 @@ Test.Modules.SHAPE = {
_context.lineTo(100, 0);
_context.lineTo(100, 100);
_context.closePath();
context.fillStroke(this);
context.fillStrokeShape(this);
},
x: 200,
y: 100,