scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-05 20:32:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve detection of passed Rectangles or Points in Rectangle#contains()

Browse source
This commit is contained in:
Jürg Lehni 2011-07-11 12:21:24 +02:00
parent 077a83ca7c
commit b5b1e50ccf
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/basic/Rectangle.js
View file

@ -454,10 +454,13 @@ var Rectangle = this.Rectangle = Base.extend(/** @lends Rectangle# */{
* }
* }
*/
contains: function(rect) {
// TODO: improve handling of passed Rectangle or Point
return rect.width !== undefined
? this._containsRectangle(rect)
contains: function(arg) {
// Detect rectangles either by checking for 'width' on the passed object
// or by looking at the amount of elements in the arguments list,
// or the passed array:
return arg && arg.width !== undefined
|| (Array.isArray(arg) ? arg : arguments).length == 4
? this._containsRectangle(Rectangle.read(arguments))
: this._containsPoint(Point.read(arguments));
},