lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-07-15 16:33:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed a few bugs discovered with integration testing. added some performance tweaks

Browse Source
This commit is contained in:
Eric Rowell 2012-07-21 21:09:02 -07:00
parent f1cb695e1f
commit 781a2ebe60
5 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
dist/kinetic-core.js vendored
View File

@ -1342,7 +1342,7 @@ Kinetic.Node = Kinetic.Class.extend({
if(this.attrs.scale.x !== 1 || this.attrs.scale.y !== 1) { if(this.attrs.scale.x !== 1 || this.attrs.scale.y !== 1) {
m.scale(this.attrs.scale.x, this.attrs.scale.y); m.scale(this.attrs.scale.x, this.attrs.scale.y);
} }
if(this.attrs.offset.x !== 0 || this.attrs.offset.y !== 0) { if(this.attrs.offset && (this.attrs.offset.x !== 0 || this.attrs.offset.y !== 0)) {
m.translate(-1 * this.attrs.offset.x, -1 * this.attrs.offset.y); m.translate(-1 * this.attrs.offset.x, -1 * this.attrs.offset.y);
} }
@ -3161,6 +3161,14 @@ Kinetic.Layer = Kinetic.Container.extend({
getContext: function() { getContext: function() {
return this.canvas.context; return this.canvas.context;
}, },
/**
* clear canvas tied to the layer
* @name clear
* @methodOf Kinetic.Layer.prototype
*/
clear: function() {
this.getCanvas().clear();
},
/** /**
* Creates a composite data URL. If MIME type is not * Creates a composite data URL. If MIME type is not
* specified, then "image/png" will result. For "image/jpeg", specify a quality * specified, then "image/png" will result. For "image/jpeg", specify a quality
@ -3367,11 +3375,9 @@ Kinetic.Shape = Kinetic.Node.extend({
* */ * */
fill: function(context) { fill: function(context) {
var appliedShadow = false; var appliedShadow = false;
context.save();
var fill = this.attrs.fill; var fill = this.attrs.fill;
if(fill) { if(fill) {
context.save();
if(this.attrs.shadow && !this.appliedShadow) { if(this.attrs.shadow && !this.appliedShadow) {
appliedShadow = this._applyShadow(context); appliedShadow = this._applyShadow(context);
} }
@ -3435,8 +3441,8 @@ Kinetic.Shape = Kinetic.Node.extend({
context.fillStyle = f; context.fillStyle = f;
context.fill(context); context.fill(context);
} }
context.restore();
} }
context.restore();
if(appliedShadow) { if(appliedShadow) {
this.fill(context); this.fill(context);
@ -3450,18 +3456,17 @@ Kinetic.Shape = Kinetic.Node.extend({
*/ */
fillText: function(context, text) { fillText: function(context, text) {
var appliedShadow = false; var appliedShadow = false;
context.save();
if(this.attrs.textFill) { if(this.attrs.textFill) {
context.save();
if(this.attrs.shadow && !this.appliedShadow) { if(this.attrs.shadow && !this.appliedShadow) {
appliedShadow = this._applyShadow(context); appliedShadow = this._applyShadow(context);
} }
context.fillStyle = this.attrs.textFill; context.fillStyle = this.attrs.textFill;
context.fillText(text, 0, 0); context.fillText(text, 0, 0);
context.restore();
} }
context.restore();
if(appliedShadow) { if(appliedShadow) {
this.fillText(context, text, 0, 0); this.fillText(contex, text, 0, 0);
} }
}, },
/** /**
@ -3473,24 +3478,20 @@ Kinetic.Shape = Kinetic.Node.extend({
*/ */
strokeText: function(context, text) { strokeText: function(context, text) {
var appliedShadow = false; var appliedShadow = false;
context.save();
if(this.attrs.textStroke || this.attrs.textStrokeWidth) { if(this.attrs.textStroke || this.attrs.textStrokeWidth) {
context.save();
if(this.attrs.shadow && !this.appliedShadow) { if(this.attrs.shadow && !this.appliedShadow) {
appliedShadow = this._applyShadow(context); appliedShadow = this._applyShadow(context);
} }
// defaults // defaults
if(!this.attrs.textStroke) { var textStroke = this.attrs.textStroke ? this.attrs.textStroke : 'black';
this.attrs.textStroke = 'black'; var textStrokeWidth = this.attrs.textStrokeWidth ? this.attrs.textStrokeWidth : 2;
} context.lineWidth = textStrokeWidth;
else if(!this.attrs.textStrokeWidth && this.attrs.textStrokeWidth !== 0) { context.strokeStyle = textStroke;
this.attrs.textStrokeWidth = 2; context.strokeText(text, 0, 0);
} context.restore();
context.lineWidth = this.attrs.textStrokeWidth;
context.strokeStyle = this.attrs.textStroke;
context.strokeText(context, text, 0, 0);
} }
context.restore();
if(appliedShadow) { if(appliedShadow) {
this.strokeText(context, text, 0, 0); this.strokeText(context, text, 0, 0);
@ -3512,7 +3513,7 @@ Kinetic.Shape = Kinetic.Node.extend({
if(this.attrs.shadow && !this.appliedShadow) { if(this.attrs.shadow && !this.appliedShadow) {
appliedShadow = this._applyShadow(context); appliedShadow = this._applyShadow(context);
} }
if(a.length === 6) { if(a.length === 6) {
context.drawImage(a[1], a[2], a[3], a[4], a[5]); context.drawImage(a[1], a[2], a[3], a[4], a[5]);
} }
@ -3618,7 +3619,7 @@ Kinetic.Shape = Kinetic.Node.extend({
var m = t.getMatrix(); var m = t.getMatrix();
context.transform(m[0], m[1], m[2], m[3], m[4], m[5]); context.transform(m[0], m[1], m[2], m[3], m[4], m[5]);
} }
/* /*
* pre styles include alpha, linejoin * pre styles include alpha, linejoin
*/ */

4
dist/kinetic-core.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
src/Layer.js
View File

@ -93,6 +93,14 @@ Kinetic.Layer = Kinetic.Container.extend({
getContext: function() { getContext: function() {
return this.canvas.context; return this.canvas.context;
}, },
/**
* clear canvas tied to the layer
* @name clear
* @methodOf Kinetic.Layer.prototype
*/
clear: function() {
this.getCanvas().clear();
},
/** /**
* Creates a composite data URL. If MIME type is not * Creates a composite data URL. If MIME type is not
* specified, then "image/png" will result. For "image/jpeg", specify a quality * specified, then "image/png" will result. For "image/jpeg", specify a quality

2
src/Node.js
View File

@ -735,7 +735,7 @@ Kinetic.Node = Kinetic.Class.extend({
if(this.attrs.scale.x !== 1 || this.attrs.scale.y !== 1) { if(this.attrs.scale.x !== 1 || this.attrs.scale.y !== 1) {
m.scale(this.attrs.scale.x, this.attrs.scale.y); m.scale(this.attrs.scale.x, this.attrs.scale.y);
} }
if(this.attrs.offset.x !== 0 || this.attrs.offset.y !== 0) { if(this.attrs.offset && (this.attrs.offset.x !== 0 || this.attrs.offset.y !== 0)) {
m.translate(-1 * this.attrs.offset.x, -1 * this.attrs.offset.y); m.translate(-1 * this.attrs.offset.x, -1 * this.attrs.offset.y);
} }

37
src/Shape.js
View File

@ -82,11 +82,9 @@ Kinetic.Shape = Kinetic.Node.extend({
* */ * */
fill: function(context) { fill: function(context) {
var appliedShadow = false; var appliedShadow = false;
context.save();
var fill = this.attrs.fill; var fill = this.attrs.fill;
if(fill) { if(fill) {
context.save();
if(this.attrs.shadow && !this.appliedShadow) { if(this.attrs.shadow && !this.appliedShadow) {
appliedShadow = this._applyShadow(context); appliedShadow = this._applyShadow(context);
} }
@ -150,8 +148,8 @@ Kinetic.Shape = Kinetic.Node.extend({
context.fillStyle = f; context.fillStyle = f;
context.fill(context); context.fill(context);
} }
context.restore();
} }
context.restore();
if(appliedShadow) { if(appliedShadow) {
this.fill(context); this.fill(context);
@ -165,18 +163,17 @@ Kinetic.Shape = Kinetic.Node.extend({
*/ */
fillText: function(context, text) { fillText: function(context, text) {
var appliedShadow = false; var appliedShadow = false;
context.save();
if(this.attrs.textFill) { if(this.attrs.textFill) {
context.save();
if(this.attrs.shadow && !this.appliedShadow) { if(this.attrs.shadow && !this.appliedShadow) {
appliedShadow = this._applyShadow(context); appliedShadow = this._applyShadow(context);
} }
context.fillStyle = this.attrs.textFill; context.fillStyle = this.attrs.textFill;
context.fillText(text, 0, 0); context.fillText(text, 0, 0);
context.restore();
} }
context.restore();
if(appliedShadow) { if(appliedShadow) {
this.fillText(context, text, 0, 0); this.fillText(contex, text, 0, 0);
} }
}, },
/** /**
@ -188,24 +185,20 @@ Kinetic.Shape = Kinetic.Node.extend({
*/ */
strokeText: function(context, text) { strokeText: function(context, text) {
var appliedShadow = false; var appliedShadow = false;
context.save();
if(this.attrs.textStroke || this.attrs.textStrokeWidth) { if(this.attrs.textStroke || this.attrs.textStrokeWidth) {
context.save();
if(this.attrs.shadow && !this.appliedShadow) { if(this.attrs.shadow && !this.appliedShadow) {
appliedShadow = this._applyShadow(context); appliedShadow = this._applyShadow(context);
} }
// defaults // defaults
if(!this.attrs.textStroke) { var textStroke = this.attrs.textStroke ? this.attrs.textStroke : 'black';
this.attrs.textStroke = 'black'; var textStrokeWidth = this.attrs.textStrokeWidth ? this.attrs.textStrokeWidth : 2;
} context.lineWidth = textStrokeWidth;
else if(!this.attrs.textStrokeWidth && this.attrs.textStrokeWidth !== 0) { context.strokeStyle = textStroke;
this.attrs.textStrokeWidth = 2; context.strokeText(text, 0, 0);
} context.restore();
context.lineWidth = this.attrs.textStrokeWidth;
context.strokeStyle = this.attrs.textStroke;
context.strokeText(context, text, 0, 0);
} }
context.restore();
if(appliedShadow) { if(appliedShadow) {
this.strokeText(context, text, 0, 0); this.strokeText(context, text, 0, 0);
@ -227,7 +220,7 @@ Kinetic.Shape = Kinetic.Node.extend({
if(this.attrs.shadow && !this.appliedShadow) { if(this.attrs.shadow && !this.appliedShadow) {
appliedShadow = this._applyShadow(context); appliedShadow = this._applyShadow(context);
} }
if(a.length === 6) { if(a.length === 6) {
context.drawImage(a[1], a[2], a[3], a[4], a[5]); context.drawImage(a[1], a[2], a[3], a[4], a[5]);
} }
@ -333,7 +326,7 @@ Kinetic.Shape = Kinetic.Node.extend({
var m = t.getMatrix(); var m = t.getMatrix();
context.transform(m[0], m[1], m[2], m[3], m[4], m[5]); context.transform(m[0], m[1], m[2], m[3], m[4], m[5]);
} }
/* /*
* pre styles include alpha, linejoin * pre styles include alpha, linejoin
*/ */