Merge branch 'refs/heads/master' into apply-matrix

This commit is contained in:
Jürg Lehni 2014-03-02 01:27:50 +01:00
commit 6fdb9f60bd
3 changed files with 10 additions and 6 deletions

View file

@ -2026,7 +2026,7 @@ var Item = Base.extend(Callback, /** @lends 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
* possible.
*/

View file

@ -116,11 +116,14 @@ new function() {
}
function importPoly(node, type) {
var path = new Path(),
points = node.points;
path.moveTo(points.getItem(0));
for (var i = 1, l = points.numberOfItems; i < l; i++)
path.lineTo(points.getItem(i));
var coords = node.getAttribute('points').match(
/[+-]?(?:\d*\.\d+|\d+\.?)(?:[eE][+-]?\d+)?/g),
points = [];
for (var i = 0, l = coords.length; i < l; i += 2)
points.push(new Point(
parseFloat(coords[i]),
parseFloat(coords[i + 1])));
var path = new Path(points);
if (type === 'polygon')
path.closePath();
return path;

View file

@ -24,6 +24,7 @@
var TextItem = Item.extend(/** @lends TextItem# */{
_class: 'TextItem',
_boundsSelected: true,
_transformContent: false,
_serializeFields: {
content: null
},