Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-05-18 18:41:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove fabric.Group.containsPoint => uses now fabric.Object.containsPoint

Browse source 
Update group unit test - containsPoint checks now scaled group and group with padding
Fix text unit test (complexity, toString)
This commit is contained in:
Kienz 2013-05-20 18:41:16 +02:00
parent 4aa656c549
commit f0ca6b7b8f
3 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/group.class.js
View file

@ -384,24 +384,6 @@
this.top = (minY + height / 2) || 0;
},
/**
* Checks if point is contained within the group
* @param {fabric.Point} point point with `x` and `y` properties
* @return {Boolean} true if point is contained within group
*/
containsPoint: function(point) {
var halfWidth = this.get('width') / 2,
halfHeight = this.get('height') / 2,
centerX = this.get('left'),
centerY = this.get('top');
return centerX - halfWidth < point.x &&
centerX + halfWidth > point.x &&
centerY - halfHeight < point.y &&
centerY + halfHeight > point.y;
},
/* _TO_SVG_START_ */
/**
* Returns svg representation of an instance

14
test/unit/group.js
View file

@ -295,6 +295,20 @@
ok(group.containsPoint({ x: 50, y: 120 }));
ok(group.containsPoint({ x: 100, y: 100 }));
ok(!group.containsPoint({ x: 0, y: 0 }));
group.scale(2);
ok(group.containsPoint({ x: 50, y: 120 }));
ok(group.containsPoint({ x: 100, y: 160 }));
ok(!group.containsPoint({ x: 0, y: 0 }));
ok(!group.containsPoint({ x: 100, y: 170 }));
group.scale(1);
group.padding = 30;
group.setCoords();
ok(group.containsPoint({ x: 50, y: 120 }));
ok(group.containsPoint({ x: 100, y: 170 }));
ok(!group.containsPoint({ x: 0, y: 0 }));
ok(!group.containsPoint({ x: 100, y: 172 }));
});
test('forEachObject', function() {

3
test/unit/text.js
View file

@ -66,7 +66,7 @@
test('toString', function() {
var text = createTextObject();
ok(typeof text.toString == 'function');
equal(text.toString(), '#<fabric.Text (0): { "text": "x", "fontFamily": "Times New Roman" }>');
equal(text.toString(), '#<fabric.Text (1): { "text": "x", "fontFamily": "Times New Roman" }>');
});
test('toObject', function() {
@ -78,6 +78,7 @@
test('complexity', function(){
var text = createTextObject();
ok(typeof text.complexity == 'function');
equal(text.complexity(), 1);
});
test('set', function() {