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

Merge branch 'master' of https://github.com/paperjs/paper.js

Browse source
This commit is contained in:
Jonathan Puckey 2012-11-23 17:48:01 +01:00
commit 7e9420c6f8
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/path/CompoundPath.js
View file

@ -72,7 +72,7 @@ var CompoundPath = this.CompoundPath = PathItem.extend(/** @lends CompoundPath#
* *
* @return {CompoundPath|Path} the flattened compound path * @return {CompoundPath|Path} the flattened compound path
*/ */
flatten: function() { reduce: function() {
if (this._children.length == 1) { if (this._children.length == 1) {
var child = this._children[0]; var child = this._children[0];
child.insertAbove(this); child.insertAbove(this);

6
src/path/Path.js
View file

@ -948,10 +948,10 @@ var Path = this.Path = PathItem.extend(/** @lends Path# */{
}, },
/** /**
* For simple paths, flatten always returns the path itself. See * For simple paths, reduce always returns the path itself. See
* {@link CompoundPath#flatten()} for more explanations. * {@link CompoundPath#reduce()} for more explanations.
*/ */
flatten: function() { reduce: function() {
return this; return this;
}, },

2
src/svg/SvgImport.js
View file

@ -382,7 +382,7 @@ new function() {
break; break;
// http://www.w3.org/TR/SVG/masking.html#ClipPathProperty // http://www.w3.org/TR/SVG/masking.html#ClipPathProperty
case 'clip-path': case 'clip-path':
var clipPath = getDefinition(value).clone().flatten(); var clipPath = getDefinition(value).clone().reduce();
item = createClipGroup(item, clipPath); item = createClipGroup(item, clipPath);
break; break;
// http://www.w3.org/TR/SVG/types.html#DataTypeTransformList // http://www.w3.org/TR/SVG/types.html#DataTypeTransformList