Fixed: Font Awesome loaded by Web Font Loader (#82)

This commit is contained in:
nobody 2020-08-19 10:00:26 +02:00
parent f017311fa2
commit de7a3525f7
No known key found for this signature in database
GPG Key ID: 8F6DE3D614FCFD7A
6 changed files with 13 additions and 18 deletions

View File

@ -732,8 +732,8 @@ var mappings = {
'/': {
'releases/v{version}/css/': resources.fontawesome5CSS,
'releases/v{version}/js/': resources.fontawesome5JS,
'a1f20be65b.js': resources.webfontloaderFontawesomeJS,
'a1f20be65b.css': resources.webfontloaderFontawesomeCSS,
'fa-code.js': resources.webfontloaderFontawesomeJS,
'fa-code.css': resources.webfontloaderFontawesomeCSS,
'webfontloader/{version}/webfontload': resources.webfontloader
}
},

View File

@ -691,11 +691,11 @@ var resources = {
'type': 'application/javascript'
},
'webfontloaderFontawesomeJS': {
'path': 'resources/webfont/a1f20be65b.jsm',
'path': 'resources/webfont/fa-code.jsm',
'type': 'application/javascript'
},
'webfontloaderFontawesomeCSS': {
'path': 'resources/webfont/a1f20be65b.css',
'path': 'resources/webfont/fa-code.css',
'type': 'text/css'
},
// WebRTC adapter

View File

@ -132,20 +132,20 @@ shorthands.specialFiles = function (channelHost, channelPath, searchString) {
'path': 'resources/bootstrap-datepicker/1.9.0/bootstrap-datepicker.standalone.min.css',
'bundle': ''
};
} else if (channelHost + channelPath === 'use.fontawesome.com/a1f20be65b.js') {
} else if (channelHost + channelPath === 'use.fontawesome.com/fa-code.css') {
return {
'source': channelHost,
'versionRequested': '4.6.3',
'versionDelivered': '4.7.0',
'path': 'resources/webfont/a1f20be65b.jsm',
'path': 'resources/webfont/fa-loader.css',
'bundle': ''
};
} else if (channelHost + channelPath === 'use.fontawesome.com/a1f20be65b.css') {
} else if (/use\.fontawesome\.com\/[a-z0-9]{10}\.js/.test(channelHost + channelPath)) {
return {
'source': channelHost,
'versionRequested': '4.6.3',
'versionDelivered': '4.7.0',
'path': 'resources/webfont/a1f20be65b.css',
'path': 'resources/webfont/fa-loader.jsm',
'bundle': ''
};
} else {

View File

@ -25,6 +25,7 @@
</div>
<ul>
<li>Fixed: Blocked Google Fonts in Chromium (<a href="https://codeberg.org/nobody/LocalCDN/issues/80">#80</a>)</li>
<li>Fixed: Font Awesome loaded by Web Font Loader (<a href="https://codeberg.org/nobody/LocalCDN/issues/82">#82</a>)</li>
</ul>
<div id="generator-section">
<div class="topic-label">

View File

@ -1,7 +1,4 @@
/*!
* Font Awesome v4.6.3 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*
/*
* 2020-08-03
* File modified by nobody/LocalCDN
*
@ -20,6 +17,3 @@
font-weight: normal;
font-style: normal;
}
/*
Embed code a1f20be65b
*/

View File

@ -2,12 +2,12 @@ window.FontAwesomeConfig = {
asyncEnabled: true,
autoAccessibilityEnabled: true,
reportingEnabled: true,
reportingDomains: "localhost, *.dev",
useUrl: "use.fontawesome.com",
faCdnUrl: "https://cdn.fontawesome.com:443",
code: "a1f20be65b",
code: "fa-code",
webFontLoaderVersion: "1.6.24"
};
window.FontAwesome||(window.FontAwesome={}),function(){function a(a){this.el=a;for(var b=a.className.replace(/^\s+|\s+$/g,"").split(/\s+/),c=0;c<b.length;c++)d.call(this,b[c])}function b(a,b,c){Object.defineProperty?Object.defineProperty(a,b,{get:c}):a.__defineGetter__(b,c)}if(!("undefined"==typeof window.Element||"classList"in document.documentElement)){var c=Array.prototype,d=c.push,e=c.splice,f=c.join;a.prototype={add:function(a){this.contains(a)||(d.call(this,a),this.el.className=this.toString())},contains:function(a){return-1!=this.el.className.indexOf(a)},item:function(a){return this[a]||null},remove:function(a){if(this.contains(a)){for(var b=0;b<this.length&&this[b]!=a;b++);e.call(this,b,1),this.el.className=this.toString()}},toString:function(){return f.call(this," ")},toggle:function(a){return this.contains(a)?this.remove(a):this.add(a),this.contains(a)}},window.DOMTokenList=a,b(Element.prototype,"classList",function(){return new a(this)})}}(),function(a,b,c){function d(){}function e(a){var c,d=[],e=b,f=e.documentElement.doScroll,g="DOMContentLoaded",h=(f?/^loaded|^c/:/^loaded|^i|^c/).test(e.readyState);h||e.addEventListener(g,c=function(){for(e.removeEventListener(g,c),h=1;c=d.shift();)c()}),h?setTimeout(a,0):d.push(a)}function f(a){var b=!1;return p.split(",").forEach(function(c){var d=new RegExp(c.trim().replace(".","\\.").replace("*","(.*)"));a.match(d)&&(b=!0)}),b}function g(){var a,c,d,e=b.querySelectorAll(".fa");Array.prototype.forEach.call(e,function(e){a=e.getAttribute("title"),e.setAttribute("aria-hidden","true"),c=e.nextElementSibling?!e.nextElementSibling.classList.contains("sr-only"):!0,a&&c&&(d=b.createElement("span"),d.innerHTML=a,d.classList.add("sr-only"),e.parentNode.insertBefore(d,e.nextSibling))})}function h(a){"undefined"!=typeof MutationObserver&&new MutationObserver(a).observe(b,{childList:!0,subtree:!0})}function i(){var a=b.createElement("link");a.href="https://"+q+"/"+s+".css",a.media="all",a.rel="stylesheet",b.getElementsByTagName("head")[0].appendChild(a)}function j(){var c,e=b.createElement("script"),f={},g=b.scripts[0];a.WebFontConfig||(a.WebFontConfig={}),f=a.WebFontConfig,f.custom||(f.custom={}),f.custom.families||(f.custom.families=[]),f.custom.urls||(f.custom.urls=[]),f.custom.testStrings||(f.custom.testStrings={}),f.custom.families.push("FontAwesome"),f.custom.urls.push("https://"+q+"/"+s+".css"),f.custom.testStrings.FontAwesome="",c=f.fontactive||d,f.fontactive=function(b,e){var f=(a.FontAwesomeHooks||{}).loaded||d;c(b,e),"FontAwesome"===b&&"n4"===e&&f()},e.src="https://"+q+"/webfontloader/"+t+"/webfontloader.js",g.parentNode.insertBefore(e,g)}function k(){var a=b.createElement("script"),c=b.scripts[0];a.src=r+"/js/stats.js",c.parentNode.appendChild(a)}function l(){return n&&(e(g),h(g)),o&&f(location.host)&&k(),m?j():i()}var m=a.FontAwesomeConfig.asyncEnabled,n=a.FontAwesomeConfig.autoAccessibilityEnabled,o=a.FontAwesomeConfig.reportingEnabled,p=a.FontAwesomeConfig.reportingDomains,q=a.FontAwesomeConfig.useUrl,r=a.FontAwesomeConfig.faCdnUrl,s=a.FontAwesomeConfig.code,t=a.FontAwesomeConfig.webFontLoaderVersion;a.FontAwesome.load=l}(this,document);try{window.FontAwesome.load()}catch(e){}