|
|
@@ -1103,21 +1103,17 @@ this.SingleFileCore = this.SingleFileCore || (() => {
|
|
|
if (DomUtil.testValidPath(resourceURL, baseURI)) {
|
|
|
resourceURL = new URL(resourceURL, baseURI).href;
|
|
|
if (DomUtil.testValidURL(resourceURL, baseURI)) {
|
|
|
- try {
|
|
|
- const { content, indexResource, duplicate } = await batchRequest.addURL(resourceURL);
|
|
|
- if (removeElementIfMissing && content == EMPTY_DATA_URI) {
|
|
|
- resourceElement.remove();
|
|
|
- } else {
|
|
|
- if (content.startsWith(prefixDataURI) || content.startsWith(PREFIX_DATA_URI_NO_MIMETYPE) || content.startsWith(PREFIX_DATA_URI_OCTET_STREAM)) {
|
|
|
- if (processDuplicates && duplicate && options.groupDuplicateImages && !content.startsWith(PREFIX_DATA_URI_IMAGE_SVG) && DomUtil.replaceImageSource(resourceElement, SINGLE_FILE_VARIABLE_NAME_PREFIX + indexResource, options)) {
|
|
|
- DomUtil.insertVariable(doc, indexResource, content, options);
|
|
|
- } else {
|
|
|
- resourceElement.setAttribute(attributeName, content);
|
|
|
- }
|
|
|
+ const { content, indexResource, duplicate } = await batchRequest.addURL(resourceURL);
|
|
|
+ if (removeElementIfMissing && content == EMPTY_DATA_URI) {
|
|
|
+ resourceElement.remove();
|
|
|
+ } else {
|
|
|
+ if (content.startsWith(prefixDataURI) || content.startsWith(PREFIX_DATA_URI_NO_MIMETYPE) || content.startsWith(PREFIX_DATA_URI_OCTET_STREAM)) {
|
|
|
+ if (processDuplicates && duplicate && options.groupDuplicateImages && !content.startsWith(PREFIX_DATA_URI_IMAGE_SVG) && DomUtil.replaceImageSource(resourceElement, SINGLE_FILE_VARIABLE_NAME_PREFIX + indexResource, options)) {
|
|
|
+ DomUtil.insertVariable(doc, indexResource, content, options);
|
|
|
+ } else {
|
|
|
+ resourceElement.setAttribute(attributeName, content);
|
|
|
}
|
|
|
}
|
|
|
- } catch (error) {
|
|
|
- /* ignored */
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -1197,7 +1193,7 @@ this.SingleFileCore = this.SingleFileCore || (() => {
|
|
|
const FILE_URI_PREFIX = /^file:\/\//;
|
|
|
const EMPTY_URL = /^https?:\/\/+\s*$/;
|
|
|
const ABOUT_BLANK_URI = "about:blank";
|
|
|
- const NOT_EMPTY_URL = /^(https|file)?:\/\/.+/;
|
|
|
+ const NOT_EMPTY_URL = /^(https?|file):\/\/.+/;
|
|
|
const REGEXP_URL_FN = /(url\s*\(\s*'(.*?)'\s*\))|(url\s*\(\s*"(.*?)"\s*\))|(url\s*\(\s*(.*?)\s*\))/gi;
|
|
|
const REGEXP_URL_SIMPLE_QUOTES_FN = /^url\s*\(\s*'(.*?)'\s*\)$/i;
|
|
|
const REGEXP_URL_DOUBLE_QUOTES_FN = /^url\s*\(\s*"(.*?)"\s*\)$/i;
|