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

layer tests are now passing

Browse Source
This commit is contained in:
Eric Rowell
2013-12-02 21:32:46 -08:00
parent a57d6c6106
commit 411b337efe
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Context.js
View File

@@ -188,16 +188,18 @@
* clear canvas * clear canvas
* @method * @method
* @memberof Kinetic.Context.prototype * @memberof Kinetic.Context.prototype
* @param {Object} [bounds]
* @param {Number} [bounds.x]
* @param {Number} [bounds.y]
* @param {Number} [bounds.width]
* @param {Number} [bounds.height]
*/ */
clear: function() { clear: function(bounds) {
var args = [].slice.call(arguments), var canvas = this.getCanvas(),
canvas = this.getCanvas(),
pos, size; pos, size;
if (args.length) { if (bounds) {
pos = Kinetic.Util._getXY(args); this.clearRect(bounds.x || 0, bounds.y || 0, bounds.width || 0, bounds.height || 0);
size = Kinetic.Util._getSize(args);
this.clearRect(pos.x || 0, pos.y || 0, size.width, size.height);
} }
else { else {
this.clearRect(0, 0, canvas.getWidth(), canvas.getHeight()); this.clearRect(0, 0, canvas.getWidth(), canvas.getHeight());

12
src/Layer.js
View File

@@ -153,17 +153,21 @@
* clear scene and hit canvas contexts tied to the layer * clear scene and hit canvas contexts tied to the layer
* @method * @method
* @memberof Kinetic.Node.prototype * @memberof Kinetic.Node.prototype
* @param {Array|Object} [bounds] * @param {Object} [bounds]
* @param {Number} [bounds.x]
* @param {Number} [bounds.y]
* @param {Number} [bounds.width]
* @param {Number} [bounds.height]
* @example * @example
* layer.clear();<br> * layer.clear();<br>
* layer.clear(0, 0, 100, 100); * layer.clear(0, 0, 100, 100);
*/ */
clear: function() { clear: function(bounds) {
var context = this.getContext(), var context = this.getContext(),
hitContext = this.getHitCanvas().getContext(); hitContext = this.getHitCanvas().getContext();
context.clear.apply(context, arguments); context.clear(bounds);
hitContext.clear.apply(hitContext, arguments); hitContext.clear(bounds);
return this; return this;
}, },
// extend Node.prototype.setVisible // extend Node.prototype.setVisible

10
test/unit/Layer-test.js
View File

@@ -88,7 +88,7 @@ suite('Layer', function() {
layer.add(circle); layer.add(circle);
stage.add(layer); stage.add(layer);
layer.clear(100, 100, 100, 100); layer.clear({x:100, y:100, width: 100, height:100});
var trace = layer.getContext().getTrace(); var trace = layer.getContext().getTrace();
//console.log(trace); //console.log(trace);
@@ -130,9 +130,9 @@ suite('Layer', function() {
layer.add(greenCircle); layer.add(greenCircle);
stage.add(layer); stage.add(layer);
assert.equal(layer.getIntersection(300, 100).getId(), 'greenCircle', 'shape should be greenCircle'); assert.equal(layer.getIntersection({x:300, y:100}).getId(), 'greenCircle', 'shape should be greenCircle');
assert.equal(layer.getIntersection(380, 100).getId(), 'redCircle', 'shape should be redCircle'); assert.equal(layer.getIntersection({x:380, y:100}).getId(), 'redCircle', 'shape should be redCircle');
assert.equal(layer.getIntersection(100, 100), null, 'shape should be null'); assert.equal(layer.getIntersection({x:100, y:100}), null, 'shape should be null');
}); });
@@ -186,7 +186,7 @@ suite('Layer', function() {
stage.add(layer); stage.add(layer);
for(var n = 0; n < 20; n++) { for(var n = 0; n < 20; n++) {
circle.move(10, 0); circle.move({x:10, y:0});
layer.draw(); layer.draw();
} }