thanthos/Font-Awesome-Pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Release 5.12.1 (#1474)

Browse Source
This commit is contained in:
Rob Madole
2020-02-05 08:32:15 -06:00
committed by GitHub
parent 74c5b96eeb
commit c7585e1eaf
357 changed files with 3569 additions and 876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/conflict-detection.js
View File

@@ -1,5 +1,5 @@
/*!
* Font Awesome Pro 5.12.0 by @fontawesome - https://fontawesome.com
* Font Awesome Pro 5.12.1 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license (Commercial License)
*/
(function (global, factory) {
@@ -602,6 +602,11 @@
var timeoutAttr = 'data-fa-detection-timeout';
var resultsCollectionMaxWaitAttr = 'data-fa-detection-results-collection-max-wait';
var silenceErrors = function silenceErrors(e) {
e.preventDefault();
e.stopPropagation();
};
function pollUntil(_ref) {
var _ref$fn = _ref.fn,
fn = _ref$fn === void 0 ? function () {
@@ -726,6 +731,7 @@
diagScript.innerText = "(".concat(diagScriptFun.toString(), ")('").concat(nodeUnderTestId, "', '").concat(testIconId || 'foo', "', '").concat(md5, "', '").concat(parentOrigin, "');");
diagFrame.onload = function () {
diagFrame.contentWindow.addEventListener('error', silenceErrors, true);
diagFrame.contentDocument.head.appendChild(diagScript);
diagFrame.contentDocument.head.appendChild(scriptOrLinkTag);
diagFrame.contentDocument.body.appendChild(iTag);
@@ -825,6 +831,7 @@
diagScript.innerText = "(".concat(diagScriptFun.toString(), ")('").concat(nodeUnderTestId, "', '").concat(md5ForScript, "', '").concat(parentOrigin, "');");
diagFrame.onload = function () {
diagFrame.contentWindow.addEventListener('error', silenceErrors, true);
diagFrame.contentDocument.head.appendChild(diagScript);
diagFrame.contentDocument.head.appendChild(scriptUnderTest);
};