mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 01:54:15 +00:00
Merge pull request #2580 from uniba-ub/issue2450-cssrules-exception
Check cssRules before css variables are read from stylesheet (again)
This commit is contained in:
@@ -26,6 +26,19 @@ export class CSSVariableService {
|
|||||||
return styleSheet.href.indexOf(window.location.origin) === 0;
|
return styleSheet.href.indexOf(window.location.origin) === 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks whether the specific stylesheet object has the property cssRules
|
||||||
|
* @param styleSheet The stylesheet
|
||||||
|
*/
|
||||||
|
hasCssRules = (styleSheet) => {
|
||||||
|
// Injected (cross-origin) styles might have no css rules value and throw some exception
|
||||||
|
try {
|
||||||
|
return styleSheet.cssRules;
|
||||||
|
} catch (e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Determine if the given rule is a CSSStyleRule
|
Determine if the given rule is a CSSStyleRule
|
||||||
See: https://developer.mozilla.org/en-US/docs/Web/API/CSSRule#Type_constants
|
See: https://developer.mozilla.org/en-US/docs/Web/API/CSSRule#Type_constants
|
||||||
@@ -93,8 +106,10 @@ export class CSSVariableService {
|
|||||||
if (isNotEmpty(document.styleSheets)) {
|
if (isNotEmpty(document.styleSheets)) {
|
||||||
// styleSheets is array-like, so we convert it to an array.
|
// styleSheets is array-like, so we convert it to an array.
|
||||||
// Filter out any stylesheets not on this domain
|
// Filter out any stylesheets not on this domain
|
||||||
|
// Filter out any stylesheets that have no cssRules property
|
||||||
return [...document.styleSheets]
|
return [...document.styleSheets]
|
||||||
.filter(this.isSameDomain)
|
.filter(this.isSameDomain)
|
||||||
|
.filter(this.hasCssRules)
|
||||||
.reduce(
|
.reduce(
|
||||||
(finalArr, sheet) =>
|
(finalArr, sheet) =>
|
||||||
finalArr.concat(
|
finalArr.concat(
|
||||||
|
Reference in New Issue
Block a user