diff --git a/web-extension/extractHtml.js b/web-extension/extractHtml.js index ef56046..b39eda9 100644 --- a/web-extension/extractHtml.js +++ b/web-extension/extractHtml.js @@ -453,7 +453,6 @@ chrome.runtime.onMessage.addListener((request, sender, sendResponse) => { result = { url: getPageUrl(tmpTitle), title: tmpTitle, - baseUrl: getCurrentUrl(), styleFileContent: styleFile, styleFileName: 'style' + generateRandomNumber() + '.css', images: extractedImages, diff --git a/web-extension/utils.js b/web-extension/utils.js index 1c0fb69..5a4c606 100644 --- a/web-extension/utils.js +++ b/web-extension/utils.js @@ -99,7 +99,11 @@ function setIsBusy(isBusy) { } ///// -function getCurrentUrl() { +function getBaseUrl() { + const base = document.querySelector("base"); + if (base) { + return base.getAttribute("href"); + } let url = window.location.href; if (url.indexOf('?') > 0) { url = window.location.href.split('?')[0]; @@ -171,7 +175,7 @@ function getAbsoluteUrl(urlStr) { } try { urlStr = decodeHtmlEntity(urlStr); - let currentUrl = getCurrentUrl(); + let currentUrl = getBaseUrl(); let originUrl = getOriginUrl(); let absoluteUrl = urlStr; @@ -373,4 +377,4 @@ function jsonToCss(jsonObj) { result += '} '; } return result; -} \ No newline at end of file +}