mirror of
https://github.com/scratchfoundation/paper.js.git
synced 2025-01-07 13:22:07 -05:00
Merge branch 'refs/heads/master' into apply-matrix
This commit is contained in:
commit
6fdb9f60bd
3 changed files with 10 additions and 6 deletions
|
@ -2026,7 +2026,7 @@ var Item = Base.extend(Callback, /** @lends Item# */{
|
||||||
/**
|
/**
|
||||||
* Inserts this item below the specified item.
|
* Inserts this item below the specified item.
|
||||||
*
|
*
|
||||||
* @param {Item} item the item above which it should be inserted
|
* @param {Item} item the item below which it should be inserted
|
||||||
* @return {Item} the inserted item, or {@code null} if inserting was not
|
* @return {Item} the inserted item, or {@code null} if inserting was not
|
||||||
* possible.
|
* possible.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -116,11 +116,14 @@ new function() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function importPoly(node, type) {
|
function importPoly(node, type) {
|
||||||
var path = new Path(),
|
var coords = node.getAttribute('points').match(
|
||||||
points = node.points;
|
/[+-]?(?:\d*\.\d+|\d+\.?)(?:[eE][+-]?\d+)?/g),
|
||||||
path.moveTo(points.getItem(0));
|
points = [];
|
||||||
for (var i = 1, l = points.numberOfItems; i < l; i++)
|
for (var i = 0, l = coords.length; i < l; i += 2)
|
||||||
path.lineTo(points.getItem(i));
|
points.push(new Point(
|
||||||
|
parseFloat(coords[i]),
|
||||||
|
parseFloat(coords[i + 1])));
|
||||||
|
var path = new Path(points);
|
||||||
if (type === 'polygon')
|
if (type === 'polygon')
|
||||||
path.closePath();
|
path.closePath();
|
||||||
return path;
|
return path;
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
var TextItem = Item.extend(/** @lends TextItem# */{
|
var TextItem = Item.extend(/** @lends TextItem# */{
|
||||||
_class: 'TextItem',
|
_class: 'TextItem',
|
||||||
_boundsSelected: true,
|
_boundsSelected: true,
|
||||||
|
_transformContent: false,
|
||||||
_serializeFields: {
|
_serializeFields: {
|
||||||
content: null
|
content: null
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue