kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Be more forgiving if webfonts aren't loading

Browse Source
This commit is contained in:
Joshua Granick
2017-10-26 10:01:47 -07:00
parent f9c6076de8
commit 786ba5d42e
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lime/text/Font.hx
View File

@@ -10,6 +10,7 @@ import lime.graphics.ImageBuffer;
import lime.math.Vector2; import lime.math.Vector2;
import lime.net.HTTPRequest; import lime.net.HTTPRequest;
import lime.system.System; import lime.system.System;
import lime.utils.Log;
import lime.utils.UInt8Array; import lime.utils.UInt8Array;
#if (js && html5) #if (js && html5)
@@ -457,17 +458,21 @@ class Font {
#if (js && html5) #if (js && html5)
this.name = name; this.name = name;
var font = name;
var ua = Browser.navigator.userAgent.toLowerCase(); var ua = Browser.navigator.userAgent.toLowerCase();
var isSafari = (ua.indexOf(" safari/") >= 0 && ua.indexOf(" chrome/") < 0); var isSafari = (ua.indexOf(" safari/") >= 0 && ua.indexOf(" chrome/") < 0);
if (!isSafari && untyped (Browser.document).fonts && untyped (Browser.document).fonts.load) { if (!isSafari && untyped (Browser.document).fonts && untyped (Browser.document).fonts.load) {
untyped (Browser.document).fonts.load ("1em '" + font + "'").then (function (_) { untyped (Browser.document).fonts.load ("1em '" + name + "'").then (function (_) {
promise.complete (this); promise.complete (this);
}, function (_) {
Log.warn ("Could not load web font \"" + name + "\"");
promise.complete (this);
}); });
} else { } else {
@@ -482,12 +487,16 @@ class Font {
var timeout = 3000; var timeout = 3000;
var intervalLength = 50; var intervalLength = 50;
var intervalCount = 0; var intervalCount = 0;
var loaded, timeExpired;
var checkFont = function () { var checkFont = function () {
intervalCount++; intervalCount++;
if ((node1.offsetWidth != width1 || node2.offsetWidth != width2) || (intervalCount * intervalLength >= timeout)) { loaded = (node1.offsetWidth != width1 || node2.offsetWidth != width2);
timeExpired = (intervalCount * intervalLength >= timeout);
if (loaded || timeExpired) {
Browser.window.clearInterval (interval); Browser.window.clearInterval (interval);
node1.parentNode.removeChild (node1); node1.parentNode.removeChild (node1);
@@ -495,6 +504,12 @@ class Font {
node1 = null; node1 = null;
node2 = null; node2 = null;
if (timeExpired) {
Log.warn ("Could not load web font \"" + name + "\"");
}
promise.complete (this); promise.complete (this);
} }