|
|
@@ -549,13 +549,13 @@ this.SingleFileCore = this.SingleFileCore || (() => {
|
|
|
}
|
|
|
|
|
|
resetCharsetMeta() {
|
|
|
- let charSet;
|
|
|
+ let charset;
|
|
|
this.doc.querySelectorAll("meta[charset], meta[http-equiv=\"content-type\"]").forEach(element => {
|
|
|
- const charSetDeclaration = element.content.split(";")[1];
|
|
|
- if (charSetDeclaration && !charSet) {
|
|
|
- charSet = charSetDeclaration.split("=")[1];
|
|
|
- if (charSet) {
|
|
|
- this.charSet = charSet.trim().toLowerCase();
|
|
|
+ const charsetDeclaration = element.content.split(";")[1];
|
|
|
+ if (charsetDeclaration && !charset) {
|
|
|
+ charset = charsetDeclaration.split("=")[1];
|
|
|
+ if (charset) {
|
|
|
+ this.charset = charset.trim().toLowerCase();
|
|
|
}
|
|
|
}
|
|
|
element.remove();
|
|
|
@@ -771,7 +771,7 @@ this.SingleFileCore = this.SingleFileCore || (() => {
|
|
|
mediaText = element.media;
|
|
|
}
|
|
|
this.stylesheets.set(element, { mediaText });
|
|
|
- const options = { maxResourceSize: this.options.maxResourceSize, maxResourceSizeEnabled: this.options.maxResourceSizeEnabled, url: this.options.url, charSet: this.charSet, compressCSS: this.options.compressCSS };
|
|
|
+ const options = { maxResourceSize: this.options.maxResourceSize, maxResourceSizeEnabled: this.options.maxResourceSizeEnabled, url: this.options.url, charset: this.charset, compressCSS: this.options.compressCSS };
|
|
|
const isLinkTag = element.tagName.toLowerCase() == "link";
|
|
|
if (isLinkTag && element.rel.includes("alternate") && element.title) {
|
|
|
element.remove();
|
|
|
@@ -779,7 +779,7 @@ this.SingleFileCore = this.SingleFileCore || (() => {
|
|
|
let stylesheetContent;
|
|
|
if (isLinkTag) {
|
|
|
if (element.charset) {
|
|
|
- options.charSet = element.charset;
|
|
|
+ options.charset = element.charset;
|
|
|
}
|
|
|
stylesheetContent = await DomProcessorHelper.resolveLinkStylesheetURLs(element.href, this.baseURI, options);
|
|
|
} else {
|
|
|
@@ -1228,7 +1228,7 @@ this.SingleFileCore = this.SingleFileCore || (() => {
|
|
|
static async resolveLinkStylesheetURLs(resourceURL, baseURI, options) {
|
|
|
resourceURL = DomUtil.normalizeURL(resourceURL);
|
|
|
if (resourceURL && resourceURL != baseURI && resourceURL != ABOUT_BLANK_URI) {
|
|
|
- const downloadOptions = { asDataURI: false, maxResourceSize: options.maxResourceSize, maxResourceSizeEnabled: options.maxResourceSizeEnabled, charSet: options.charSet };
|
|
|
+ const downloadOptions = { asDataURI: false, maxResourceSize: options.maxResourceSize, maxResourceSizeEnabled: options.maxResourceSizeEnabled, charset: options.charset };
|
|
|
let stylesheetContent = await Download.getContent(resourceURL, downloadOptions);
|
|
|
stylesheetContent = DomUtil.removeCssComments(stylesheetContent);
|
|
|
if (options.compressCSS) {
|