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

cleaned up Canvas

Browse Source
This commit is contained in:
Eric Rowell
2013-04-12 23:45:22 -07:00
parent ad0ecd9fe9
commit 8138d2d286
4 changed files with 2 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Canvas.js
View File

@@ -423,13 +423,4 @@
}; };
Kinetic.Global.extend(Kinetic.HitCanvas, Kinetic.Canvas2D); Kinetic.Global.extend(Kinetic.HitCanvas, Kinetic.Canvas2D);
Kinetic.GenericCanvas = function(config) {
Kinetic.Canvas.call(this, config);
};
Kinetic.GenericCanvas.prototype = {
clear: function() {}
};
Kinetic.Global.extend(Kinetic.GenericCanvas, Kinetic.Canvas);
})(); })();

13
src/Layer.js
View File

@@ -16,22 +16,12 @@
Kinetic.Layer.prototype = { Kinetic.Layer.prototype = {
_initLayer: function(config) { _initLayer: function(config) {
var contextType = '';
this.nodeType = 'Layer'; this.nodeType = 'Layer';
this.createAttrs(); this.createAttrs();
// call super constructor // call super constructor
Kinetic.Container.call(this, config); Kinetic.Container.call(this, config);
contextType = this.getContextType(); this.canvas = new Kinetic.SceneCanvas();
if (contextType === '2d') {
this.canvas = new Kinetic.SceneCanvas();
}
else {
this.canvas = new Kinetic.GenericCanvas({
contextType: contextType
});
}
this.canvas.getElement().style.position = 'absolute'; this.canvas.getElement().style.position = 'absolute';
this.hitCanvas = new Kinetic.HitCanvas(); this.hitCanvas = new Kinetic.HitCanvas();
}, },
@@ -222,7 +212,6 @@
// add getters and setters // add getters and setters
Kinetic.Node.addGetterSetter(Kinetic.Layer, 'clearBeforeDraw', true); Kinetic.Node.addGetterSetter(Kinetic.Layer, 'clearBeforeDraw', true);
Kinetic.Node.addGetterSetter(Kinetic.Layer, 'contextType', '2d');
/** /**
* set flag which determines if the layer is cleared or not * set flag which determines if the layer is cleared or not

1
tests/html/unitTests.html
View File

@@ -3,6 +3,7 @@
<head> <head>
<link rel="stylesheet" type="text/css"href="../base.css"> <link rel="stylesheet" type="text/css"href="../base.css">
<script src="../../dist/kinetic-vcurrent.js"></script> <script src="../../dist/kinetic-vcurrent.js"></script>
<!-- assets --> <!-- assets -->
<script src="../assets/worldMap.js"></script> <script src="../assets/worldMap.js"></script>
<script src="../assets/tiger.js"></script> <script src="../assets/tiger.js"></script>

17
tests/js/unit/layerTests.js
View File

@@ -28,24 +28,7 @@ Test.Modules.LAYER = {
test(style.padding === '0px', 'canvas padding style should be 0px'); test(style.padding === '0px', 'canvas padding style should be 0px');
test(style.backgroundColor === 'transparent', 'canvas backgroundColor style should be transparent'); test(style.backgroundColor === 'transparent', 'canvas backgroundColor style should be transparent');
}, },
'webgl context type': function(containerId) {
var stage = new Kinetic.Stage({
container: containerId,
width: 578,
height: 200
});
var layer = new Kinetic.Layer({
contextType: 'experimental-webgl'
});
stage.add(layer);
test(layer.getContextType() === 'experimental-webgl', 'context type should be experimental-webgl');
},
'layer getIntersections()': function(containerId) { 'layer getIntersections()': function(containerId) {
var stage = new Kinetic.Stage({ var stage = new Kinetic.Stage({
container: containerId, container: containerId,