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

decided to split Circle and Ellipse shapes because it was causing too many issues related to the mixed data type of radius, which could be a number or object with x and y properties

Browse Source
This commit is contained in:
Eric Rowell
2012-08-25 23:56:39 -07:00
parent ddfcab2d55
commit 6eda6d2607
9 changed files with 342 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/js/functionalTests.js
View File

@@ -9,7 +9,7 @@ Test.prototype.tests = {
throttle: 999
});
var layer = new Kinetic.Layer();
var circle = new Kinetic.Ellipse({
var circle = new Kinetic.Circle({
x: 380,
y: stage.getHeight() / 2,
radius: 70,
@@ -82,7 +82,7 @@ Test.prototype.tests = {
throttle: 999
});
var layer = new Kinetic.Layer();
var circle = new Kinetic.Ellipse({
var circle = new Kinetic.Circle({
x: 380,
y: 100,
radius: 70,
@@ -158,14 +158,14 @@ Test.prototype.tests = {
draggable: true
});
var circle1 = new Kinetic.Ellipse({
var circle1 = new Kinetic.Circle({
x: stage.getWidth() / 2,
y: stage.getHeight() / 2,
radius: 70,
fill: 'red'
});
var circle2 = new Kinetic.Ellipse({
var circle2 = new Kinetic.Circle({
x: 400,
y: stage.getHeight() / 2,
radius: 70,
@@ -213,7 +213,7 @@ Test.prototype.tests = {
var layer = new Kinetic.Layer({
throttle: 999
});
var circle = new Kinetic.Ellipse({
var circle = new Kinetic.Circle({
x: 380,
y: stage.getHeight() / 2,
radius: 70,
@@ -270,7 +270,7 @@ Test.prototype.tests = {
throttle: 999
});
var layer = new Kinetic.Layer();
var circle = new Kinetic.Ellipse({
var circle = new Kinetic.Circle({
x: stage.getWidth() / 2,
y: stage.getHeight() / 2,
radius: 70,
@@ -547,7 +547,7 @@ Test.prototype.tests = {
var layer = new Kinetic.Layer();
var group = new Kinetic.Group();
var redCircle = new Kinetic.Ellipse({
var redCircle = new Kinetic.Circle({
x: stage.getWidth() / 2,
y: stage.getHeight() / 2,
radius: 80,
@@ -557,7 +557,7 @@ Test.prototype.tests = {
name: 'red'
});
var greenCircle = new Kinetic.Ellipse({
var greenCircle = new Kinetic.Circle({
x: stage.getWidth() / 2,
y: stage.getHeight() / 2,
radius: 40,
@@ -635,7 +635,7 @@ Test.prototype.tests = {
var groupMouseovers = 0;
var groupMouseouts = 0;
var redEllipse = new Kinetic.Ellipse({
var redCircle = new Kinetic.Circle({
x: stage.getWidth() / 2,
y: stage.getHeight() / 2,
radius: 80,
@@ -645,7 +645,7 @@ Test.prototype.tests = {
name: 'red'
});
var greenEllipse = new Kinetic.Ellipse({
var greenCircle = new Kinetic.Circle({
x: stage.getWidth() / 2,
y: stage.getHeight() / 2,
radius: 40,
@@ -665,28 +665,28 @@ Test.prototype.tests = {
console.log('group out')
});
redEllipse.on('mouseover', function() {
redCircle.on('mouseover', function() {
redMouseovers++;
console.log('red over')
});
redEllipse.on('mouseout', function() {
redCircle.on('mouseout', function() {
redMouseouts++;
console.log('red out')
});
greenEllipse.on('mouseover', function() {
greenCircle.on('mouseover', function() {
greenMouseovers++;
console.log('green over')
});
greenEllipse.on('mouseout', function() {
greenCircle.on('mouseout', function() {
greenMouseouts++;
console.log('green out')
});
group.add(redEllipse);
group.add(greenEllipse);
group.add(redCircle);
group.add(greenCircle);
layer.add(group);
stage.add(layer);
@@ -777,7 +777,7 @@ Test.prototype.tests = {
throttle: 999
});
var layer = new Kinetic.Layer();
var circle = new Kinetic.Ellipse({
var circle = new Kinetic.Circle({
x: 380,
y: stage.getHeight() / 2,
radius: 70,