lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-09-18 18:27:58 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fixed up Canvas type bug. The Canvas constructor can now also take an optional isBuffer param. If not defined, default value is scene

Browse Source
This commit is contained in:
Eric Rowell
2012-11-13 22:16:36 -08:00
parent 8486cb943f
commit 2115920ab8
6 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Layer.js
View File

@@ -39,9 +39,7 @@ Kinetic.Layer.prototype = {
this.afterDrawFunc = undefined;
this.canvas = new Kinetic.Canvas();
this.canvas.getElement().style.position = 'absolute';
this.canvas.getContext().type = 'scene';
this.bufferCanvas = new Kinetic.Canvas();
this.bufferCanvas.getContext().type = 'buffer';
this.bufferCanvas = new Kinetic.Canvas(0, 0, true);
// call super constructor
Kinetic.Container.call(this, config);

2
src/Node.js
View File

@@ -732,7 +732,7 @@ Kinetic.Node.prototype = {
canvas = new Kinetic.Canvas(config.width, config.height);
}
else {
canvas = this.getStage().bufferCanvas;
canvas = this.getStage().canvas;
canvas.clear();
}

4
src/Stage.js
View File

@@ -563,9 +563,7 @@ Kinetic.Stage.prototype = {
this.attrs.container.appendChild(this.content);
this.canvas = new Kinetic.Canvas();
this.canvas.getContext().type = 'scene';
this.bufferCanvas = new Kinetic.Canvas();
this.bufferCanvas.getContext().type = 'buffer';
this.bufferCanvas = new Kinetic.Canvas(0, 0, true);
this._resizeDOM();
},

5
src/util/Canvas.js
View File

@@ -4,13 +4,16 @@
* @param {Number} width
* @param {Number} height
*/
Kinetic.Canvas = function(width, height) {
Kinetic.Canvas = function(width, height, isBuffer) {
this.element = document.createElement('canvas');
this.context = this.element.getContext('2d');
// set dimensions
this.element.width = width || 0;
this.element.height = height || 0;
// set type
this.context.type = isBuffer ? 'buffer' : 'scene';
};
Kinetic.Canvas.prototype = {

9
tests/js/Test.js
View File

@@ -72,8 +72,6 @@ Test.prototype = {
// loop through modules
for(var mod in modules) {
console.log('=================== ' + mod + ' TESTS ===================');
var tests = modules[mod];
/*
* if a test key has a star in front of it, then
@@ -86,6 +84,13 @@ Test.prototype = {
break;
}
}
};
// loop through modules
for(var mod in modules) {
console.log('=================== ' + mod + ' TESTS ===================');
var tests = modules[mod];
// loop through tests
for(var key in tests) {

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

@@ -622,7 +622,7 @@ Test.Modules.NODE = {
clone.start();
};
imageObj.src = '../assets/scorpion-sprite.png';
},
},
'node caching': function(containerId) {
var stage = new Kinetic.Stage({
container: containerId,
@@ -668,6 +668,8 @@ Test.Modules.NODE = {
width: 500,
height: 300,
callback: function(imageObj) {
//document.body.appendChild(imageObj)
test(Kinetic.Type._isElement(imageObj), 'shape toImage() should be an image object');
var cachedShape = new Kinetic.Image({
@@ -694,6 +696,7 @@ Test.Modules.NODE = {
}
});
/*
group.toImage({
callback: function(imageObj) {
test(Kinetic.Type._isElement(imageObj), 'group toImage() should be an image object');
@@ -709,6 +712,7 @@ Test.Modules.NODE = {
test(Kinetic.Type._isElement(imageObj), 'stage toImage() should be an image object');
}
});
*/
//document.body.appendChild(layer.bufferCanvas.element)
},