From 6a290a2c2c9e5cc43034ffdc54c4684b0ee55504 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Fri, 20 Jul 2018 14:24:13 -0700 Subject: [PATCH] Expand browser blacklist on document.fonts.load (resolve #1141) --- src/lime/text/Font.hx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lime/text/Font.hx b/src/lime/text/Font.hx index 65b813597..4c3284b78 100644 --- a/src/lime/text/Font.hx +++ b/src/lime/text/Font.hx @@ -515,10 +515,11 @@ class Font { this.name = name; - var ua = Browser.navigator.userAgent.toLowerCase(); - var isSafari = (ua.indexOf(" safari/") >= 0 && ua.indexOf(" chrome/") < 0); + var userAgent = Browser.navigator.userAgent.toLowerCase (); + var isSafari = (userAgent.indexOf (" safari/") >= 0 && userAgent.indexOf (" chrome/") < 0); + var isUIWebView = ~/(iPhone|iPod|iPad).*AppleWebKit(?!.*Version)/i.match (userAgent); - if (!isSafari && untyped (Browser.document).fonts && untyped (Browser.document).fonts.load) { + if (!isSafari && !isUIWebView && untyped (Browser.document).fonts && untyped (Browser.document).fonts.load) { untyped (Browser.document).fonts.load ("1em '" + name + "'").then (function (_) {