Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
roytam1 2021-03-25 09:26:26 +08:00
commit f9ded55f98
89 changed files with 168 additions and 3086 deletions

View file

@ -1371,8 +1371,12 @@ Engine.prototype = {
}
let type = chan.contentType;
if (!type.startsWith("image/"))
type = "image/x-icon";
if (!type.startsWith("image/")) {
console.warn(
"Search service: Unable to set icon, content type is not an image",
contentType);
return;
}
let dataURL = "data:" + type + ";base64," +
btoa(String.fromCharCode.apply(null, aByteArray));