Merge branch 'master' of github.com:airbnb/lottie-web
diff --git a/index.d.ts b/index.d.ts
index ebebd61..e23f20b 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -45,7 +45,7 @@
getDuration(inFrames?: boolean): number;
triggerEvent<T = any>(name: AnimationEventName, args: T): void;
addEventListener<T = any>(name: AnimationEventName, callback: AnimationEventCallback<T>): void;
- removeEventListener<T = any>(name: AnimationEventName, callback: AnimationEventCallback<T>): void;
+ removeEventListener<T = any>(name: AnimationEventName, callback?: AnimationEventCallback<T>): void;
}
export type BaseRendererConfig = {
@@ -81,7 +81,7 @@
renderer?: 'svg' | 'canvas' | 'html';
loop?: boolean | number;
autoplay?: boolean;
- initialSegment?: AnimationSegment;
+ initialSegment?: AnimationSegment;
name?: string;
assetsPath?: string;
rendererSettings?: SVGRendererConfig | CanvasRendererConfig | HTMLRendererConfig;
diff --git a/player/js/animation/AnimationManager.js b/player/js/animation/AnimationManager.js
index 23c0084..8c3ecb8 100644
--- a/player/js/animation/AnimationManager.js
+++ b/player/js/animation/AnimationManager.js
@@ -163,7 +163,7 @@
renderer = 'svg';
}
var body = document.getElementsByTagName('body')[0];
- body.innerHTML = '';
+ body.innerText = '';
var div = createTag('div');
div.style.width = '100%';
div.style.height = '100%';
diff --git a/player/js/renderers/CanvasRenderer.js b/player/js/renderers/CanvasRenderer.js
index 1b406a3..29a4f61 100644
--- a/player/js/renderers/CanvasRenderer.js
+++ b/player/js/renderers/CanvasRenderer.js
@@ -249,7 +249,7 @@
CanvasRenderer.prototype.destroy = function () {
if(this.renderConfig.clearCanvas) {
- this.animationItem.wrapper.innerHTML = '';
+ this.animationItem.wrapper.innerText = '';
}
var i, len = this.layers ? this.layers.length : 0;
for (i = len - 1; i >= 0; i-=1) {
diff --git a/player/js/renderers/HybridRenderer.js b/player/js/renderers/HybridRenderer.js
index fe66ed0..6f75f23 100644
--- a/player/js/renderers/HybridRenderer.js
+++ b/player/js/renderers/HybridRenderer.js
@@ -233,7 +233,7 @@
};
HybridRenderer.prototype.destroy = function () {
- this.animationItem.wrapper.innerHTML = '';
+ this.animationItem.wrapper.innerText = '';
this.animationItem.container = null;
this.globalData.defs = null;
var i, len = this.layers ? this.layers.length : 0;
diff --git a/player/js/renderers/SVGRenderer.js b/player/js/renderers/SVGRenderer.js
index 9c672ab..1ae2e4f 100644
--- a/player/js/renderers/SVGRenderer.js
+++ b/player/js/renderers/SVGRenderer.js
@@ -140,7 +140,7 @@
SVGRenderer.prototype.destroy = function () {
- this.animationItem.wrapper.innerHTML = '';
+ this.animationItem.wrapper.innerText = '';
this.layerElement = null;
this.globalData.defs = null;
var i, len = this.layers ? this.layers.length : 0;
diff --git a/player/js/utils/FontManager.js b/player/js/utils/FontManager.js
index f847ff8..42b50a8 100644
--- a/player/js/utils/FontManager.js
+++ b/player/js/utils/FontManager.js
@@ -29,7 +29,7 @@
parentNode.style.fontFamily = family;
var node = createTag('span');
// Characters that vary significantly among different fonts
- node.innerHTML = 'giItT1WQy@!-/#';
+ node.innerText = 'giItT1WQy@!-/#';
// Visible - so we can measure it - but not on the screen
parentNode.style.position = 'absolute';
parentNode.style.left = '-10000px';
@@ -149,7 +149,7 @@
s.setAttribute('f-origin', fontArr[i].origin);
s.setAttribute('f-family', fontArr[i].fFamily);
s.type = "text/css";
- s.innerHTML = "@font-face {" + "font-family: "+fontArr[i].fFamily+"; font-style: normal; src: url('"+fontArr[i].fPath+"');}";
+ s.innerText = "@font-face {" + "font-family: "+fontArr[i].fFamily+"; font-style: normal; src: url('"+fontArr[i].fPath+"');}";
defs.appendChild(s);
}
} else if(fontArr[i].fOrigin === 'g' || fontArr[i].origin === 1){
@@ -311,4 +311,4 @@
return Font;
-}());
\ No newline at end of file
+}());
