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

Merge branch 'master' of https://github.com/jovination/konva into jovination-master

Browse Source 
Conflicts:
	src/Stage.js
	test/unit/Node-test.js
	test/unit/Shape-test.js
	test/unit/plugins/Path-test.js
This commit is contained in:
lavrton
2015-01-27 15:13:43 +07:00
parent f9a08a6acc 0dad2412a1
commit 3b94673d73
130 changed files with 5754 additions and 5718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
test/runner.js
View File

@@ -1,7 +1,7 @@
mocha.ui('tdd');
mocha.setup("bdd");
var assert = chai.assert,
kineticContainer = document.getElementById('kinetic-container'),
konvaContainer = document.getElementById('konva-container'),
origAssertEqual = assert.equal,
origAssert = assert,
origNotEqual = assert.notEqual,
@@ -57,8 +57,8 @@ function init() {
Kinetic.enableTrace = true;
Kinetic.showWarnings = false;
Konva.enableTrace = true;
Konva.showWarnings = false;
function addStats() {
stats = new Stats();
@@ -85,13 +85,13 @@ function addStats() {
function addStage() {
var container = document.createElement('div'),
stage = new Kinetic.Stage({
stage = new Konva.Stage({
container: container,
width: 578,
height: 200
});
kineticContainer.appendChild(container);
konvaContainer.appendChild(container);
return stage;
}
@@ -136,7 +136,7 @@ function compareLayerAndCanvas(layer, canvas, tol) {
div.appendChild(b);
div.appendChild(c);
kineticContainer.appendChild(div);
konvaContainer.appendChild(div);
}
assert.equal(equal, true);
@@ -145,7 +145,7 @@ function compareLayerAndCanvas(layer, canvas, tol) {
function addContainer() {
var container = document.createElement('div');
kineticContainer.appendChild(container);
konvaContainer.appendChild(container);
return container;
}
@@ -153,13 +153,13 @@ function addContainer() {
function showCanvas(canvas) {
canvas.style.position = 'relative';
kineticContainer.appendChild(canvas);
konvaContainer.appendChild(canvas);
}
function showHit(layer) {
var canvas = layer.hitCanvas._canvas;
canvas.style.position = 'relative';
kineticContainer.appendChild(canvas);
konvaContainer.appendChild(canvas);
}
beforeEach(function(){
@@ -167,13 +167,13 @@ beforeEach(function(){
test = this.currentTest;
title.innerHTML = test.parent.title + ' - ' + test.title;
title.className = 'kinetic-title';
kineticContainer.appendChild(title);
title.className = 'konva-title';
konvaContainer.appendChild(title);
// resets
Kinetic.inDblClickWindow = false;
Kinetic.DD.isDragging = false;
Kinetic.DD.node = undefined;
Konva.inDblClickWindow = false;
Konva.DD.isDragging = false;
Konva.DD.node = undefined;
});
init();