lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-04-05 20:48:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed regression bug with createImageHitRegion. setup node server. Upated README with new test instructions

Browse Source
This commit is contained in:
Eric Rowell 2013-09-16 10:12:50 -07:00
parent ede6fb2e17
commit 5c328b838f
7 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -9,9 +9,9 @@ If you add a file in the src directory, be sure to add the filename to the sourc
[![Build Status](https://travis-ci.org/ericdrowell/KineticJS.png)](https://travis-ci.org/ericdrowell/KineticJS)
KineticJS uses Mocha for testing. Just open up test/runner.html to run the tests in your favorite browser. To run the tests in PhantomJS, run `mocha-phantomjs test/runner.html` in the console.
KineticJS uses Mocha for testing. If you haven't already, be sure to install the npm packages by running `npm install` in the project directory. The KineticJS tests must be run on a web server, so you also need to run `node server.js` in the project directory to start the node server. Once the server is running, open http://localhost:8080/test/runner.html to run the tests in your favorite browser. To run the tests in PhantomJS, run `mocha-phantomjs test/runner.html` in the console.
KineticJS is covered with hundreds of tests and well over a thousand assertions. KineticJS uses TDD (test driven development) which means that every new feature or bug fix is accompanied with at least one new test.
#Pull Requests
I'd be happy to review any pull requests that may better the KineticJS project, in particular if you have a bug fix, enhancement, or a new shape (see `src/shapes` for examples). Before doing so, please first make sure that all of the tests pass, and also make sure that you don't have any jshint errors. You can do so by running `grunt hint`
I'd be happy to review any pull requests that may better the KineticJS project, in particular if you have a bug fix, enhancement, or a new shape (see `src/shapes` for examples). Before doing so, please first make sure that all of the tests pass.

3
package.json
View File

@ -13,7 +13,8 @@
"phantomjs": "~1.9.1-8",
"mocha-phantomjs": "~3.1.2",
"grunt-cli": "~0.1.9",
"grunt": "~0.4.1"
"grunt": "~0.4.1",
"connect": "~2.9.0"
},
"readmeFilename": "README.md",
"main": "Gruntfile.js",

4
server.js Normal file
View File

@ -0,0 +1,4 @@
var connect = require('connect');
connect.createServer(
connect.static(__dirname)
).listen(8080);

9
src/Context.js
View File

@ -532,7 +532,7 @@
this.save();
this.setTransform(1, 0, 0, 1, 0, 0);
}
/////////////////////
this._applyLineCap(shape);
if(dashArray && shape.getDashArrayEnabled()) {
@ -555,6 +555,13 @@
}
}
},
applyShadow: function(shape, drawFunc) {
this.save();
this._applyShadow(shape);
drawFunc();
this.restore();
drawFunc();
},
_applyShadow: function(shape) {
var util, absOpacity, color, blur, offset, shadowOpacity;

14
src/shapes/Image.js
View File

@ -102,7 +102,7 @@
context.beginPath();
context.rect(0, 0, width, height);
context.closePath();
context.stroke(this);
context.strokeShape(this);
}
else {
context.beginPath();
@ -165,24 +165,24 @@
var that = this,
width = this.getWidth(),
height = this.getHeight(),
// TODO: may consider creating a native canvas element here instead
canvas = new Kinetic.SceneCanvas({
width: width,
height: height
}),
context = canvas.getContext(),
_context = canvas.getContext()._context,
image = this.getImage(),
imageData, data, rgbColorKey, i, n;
imageData, data, rgbColorKey, i, len;
context.drawImage(image, 0, 0);
_context.drawImage(image, 0, 0);
try {
imageData = context.getImageData(0, 0, width, height);
imageData = _context.getImageData(0, 0, width, height);
data = imageData.data;
len = data.length;
rgbColorKey = Kinetic.Util._hexToRgb(this.colorKey);
// replace non transparent pixels with color key
for(i = 0, n = data.length; i < n; i += 4) {
for(i = 0; i < len; i += 4) {
if (data[i + 3] > 0) {
data[i] = rgbColorKey.r;
data[i + 1] = rgbColorKey.g;

2
test/unit/Shape-test.js
View File

@ -356,7 +356,7 @@ suite('Shape-test', function() {
layer.draw();
var trace = layer.getContext().getTrace();
console.log(trace);
//console.log(trace);
assert.equal(trace, 'clearRect(0,0,578,200);save();transform(3,0,0,1,289,100);beginPath();arc(0,0,70,0,6.283,false);closePath();save();shadowColor=black;shadowBlur=10;shadowOffsetX=10;shadowOffsetY=10;fillStyle=green;fill();restore();fillStyle=green;fill();setLineDash([10,10]);lineWidth=4;strokeStyle=black;stroke();restore();clearRect(0,0,578,200);save();transform(3,0,0,1,289,100);beginPath();arc(0,0,70,0,6.283,false);closePath();save();shadowColor=black;shadowBlur=10;shadowOffsetX=10;shadowOffsetY=10;fillStyle=green;fill();restore();fillStyle=green;fill();save();setTransform(1,0,0,1,0,0);setLineDash([10,10]);lineWidth=4;strokeStyle=black;stroke();restore();restore();');
circle.disableFill();

7
test/unit/shapes/Image-test.js
View File

@ -195,8 +195,7 @@ suite('Image', function(){
});
// ======================================================
// TODO: skipping for now because I need to setup a node server for this one
test.skip('create image hit region', function(done) {
test('create image hit region', function(done) {
var imageObj = new Image();
var stage = addStage();
@ -224,7 +223,9 @@ suite('Image', function(){
stage.add(layer);
layer.drawHit();
var hitDataUrl = layer.hitCanvas.toDataURL();
var trace = layer.hitCanvas.getContext().getTrace();
//console.log(trace);
assert.equal(trace, 'clearRect(0,0,578,200);save();transform(1,0,0,1,200,40);drawImage([object HTMLImageElement],0,0,144,139);beginPath();rect(0,0,144,139);closePath();restore();clearRect(0,0,578,200);save();transform(1,0,0,1,200,40);drawImage([object HTMLImageElement],0,0,144,139);beginPath();rect(0,0,144,139);closePath();restore();');
done();