fixes #1429 Replaced typekit with Adobe Fonts support
diff --git a/player/index.html b/player/index.html
index 3e5534a..fa3bee7 100644
--- a/player/index.html
+++ b/player/index.html
@@ -149,6 +149,8 @@
<!-- <script src="lottie.js"></script> -->
<!-- <script src="bodymovin_light.js"></script> -->
+
+
</head>
<body>
<div id="lottie"></div>
@@ -158,8 +160,8 @@
var elem = document.getElementById('lottie');
var animData = {
container: elem,
- renderer: 'svg',
- loop: false,
+ renderer: 'html',
+ loop: true,
autoplay: true,
rendererSettings: {
progressiveLoad:true,
@@ -168,8 +170,11 @@
},
path: 'exports/render/data.json'
};
- anim = lottie.loadAnimation(animData);
- anim.setSubframe(false);
+ setTimeout(()=>{
+ anim = lottie.loadAnimation(animData);
+ // anim.setSubframe(false);
+
+ },0)
</script>
</body>
diff --git a/player/js/utils/FontManager.js b/player/js/utils/FontManager.js
index 6b7293b..42e51bb 100644
--- a/player/js/utils/FontManager.js
+++ b/player/js/utils/FontManager.js
@@ -47,20 +47,7 @@
loadedCount -= 1;
continue;
}
- if(this.fonts[i].fOrigin === 't' || this.fonts[i].origin === 2){
- if(window.Typekit && window.Typekit.load && this.typekitLoaded === 0){
- this.typekitLoaded = 1;
- try{window.Typekit.load({
- async: true,
- active: function() {
- this.typekitLoaded = 2;
- }.bind(this)
- });}catch(e){}
- }
- if(this.typekitLoaded === 2) {
- this.fonts[i].loaded = true;
- }
- } else if(this.fonts[i].fOrigin === 'n' || this.fonts[i].origin === 0){
+ if(this.fonts[i].fOrigin === 'n' || this.fonts[i].origin === 0){
this.fonts[i].loaded = true;
} else{
node = this.fonts[i].monoCase.node;
@@ -183,10 +170,11 @@
}
if (shouldLoadFont) {
- var sc = createTag('script');
+ var sc = createTag('link');
sc.setAttribute('f-forigin', fontArr[i].fOrigin);
sc.setAttribute('f-origin', fontArr[i].origin);
- sc.setAttribute('src',fontArr[i].fPath);
+ sc.setAttribute('rel','stylesheet');
+ sc.setAttribute('href',fontArr[i].fPath);
defs.appendChild(sc);
}
}
