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

Add optional joining behavior to PathItem#closePath() again and use it in #setPathData().

Browse source
This commit is contained in:
Jürg Lehni 2014-03-31 19:33:38 +02:00
parent 0dca10d192
commit 4108e9487b
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/path/CompoundPath.js
View file

@ -297,8 +297,8 @@ var CompoundPath = PathItem.extend(/** @lends CompoundPath# */{
this.moveTo(last ? point.add(last._point) : point); this.moveTo(last ? point.add(last._point) : point);
}, },
closePath: function() { closePath: function(join) {
getCurrentPath(this, true).closePath(); getCurrentPath(this, true).closePath(join);
} }
}; };

4
src/path/Path.js
View file

@ -2515,8 +2515,10 @@ var Path = PathItem.extend(/** @lends Path# */{
} }
}, },
closePath: function() { closePath: function(join) {
this.setClosed(true); this.setClosed(true);
if (join)
this.join();
} }
}; };
}, { // A dedicated scope for the tricky bounds calculations }, { // A dedicated scope for the tricky bounds calculations

6
src/path/PathItem.js
View file

@ -227,7 +227,7 @@ var PathItem = Item.extend(/** @lends PathItem# */{
case 'l': case 'l':
var move = lower === 'm'; var move = lower === 'm';
if (move && previous && previous !== 'z') if (move && previous && previous !== 'z')
this.closePath(); this.closePath(true);
for (var j = 0; j < length; j += 2) for (var j = 0; j < length; j += 2)
this[j === 0 && move ? 'moveTo' : 'lineTo']( this[j === 0 && move ? 'moveTo' : 'lineTo'](
current = getPoint(j)); current = getPoint(j));
@ -290,7 +290,7 @@ var PathItem = Item.extend(/** @lends PathItem# */{
} }
break; break;
case 'z': case 'z':
this.closePath(); this.closePath(true);
break; break;
} }
previous = lower; previous = lower;
@ -563,6 +563,8 @@ var PathItem = Item.extend(/** @lends PathItem# */{
* *
* @name PathItem#closePath * @name PathItem#closePath
* @function * @function
* @param {Boolean} join controls whether the method should attempt to merge
* the first segment with the last if they lie in the same location.
* @see Path#closed * @see Path#closed
*/ */