Merge pull request #3066 from abichinger/master
Update type definition of `AnimationItem.resize`
diff --git a/player/js/elements/helpers/TransformElement.js b/player/js/elements/helpers/TransformElement.js
index bc27023..cd733c3 100644
--- a/player/js/elements/helpers/TransformElement.js
+++ b/player/js/elements/helpers/TransformElement.js
@@ -53,7 +53,7 @@
}
}
}
- if (this.finalTransform._matMdf) {
+ if (!this.localTransforms || this.finalTransform._matMdf) {
this.finalTransform._localMatMdf = this.finalTransform._matMdf;
}
if (this.finalTransform._opMdf) {
diff --git a/player/js/elements/svgElements/SVGShapeElement.js b/player/js/elements/svgElements/SVGShapeElement.js
index d71d17c..1026f27 100644
--- a/player/js/elements/svgElements/SVGShapeElement.js
+++ b/player/js/elements/svgElements/SVGShapeElement.js
@@ -211,7 +211,7 @@
var j;
var jLen = this.stylesList.length;
for (j = 0; j < jLen; j += 1) {
- if (!this.stylesList[j].closed) {
+ if (arr.indexOf(this.stylesList[j]) === -1 && !this.stylesList[j].closed) {
arr.push(this.stylesList[j]);
}
}
@@ -255,7 +255,7 @@
if (!processedPos) {
itemsData[i] = this.createStyleElement(arr[i], level);
} else {
- itemsData[i].style.closed = false;
+ itemsData[i].style.closed = arr[i].hd;
}
if (arr[i]._render) {
if (itemsData[i].style.pElem.parentNode !== container) {
