misc changes - with force()

This commit is contained in:
Alex Adam 2020-02-28 14:05:43 +02:00
parent 411eb0f86a
commit b49b78ad88
2 changed files with 22 additions and 16 deletions

View file

@ -162,18 +162,18 @@ function getImgDownloadUrl(imgSrc) {
return getAbsoluteUrl(imgSrc);
}
function getAbsoluteUrl(urlStr) {
function getAbsoluteUrl(urlStr) {
if (!urlStr) {
return '';
}
if (urlStr.length === 0) {
return '';
}
try {
if (urlStr.length === 0) {
return '';
}
urlStr = decodeHtmlEntity(urlStr);
var currentUrl = getCurrentUrl();
var originUrl = getOriginUrl();
var absoluteUrl = urlStr;
urlStr = decodeHtmlEntity(urlStr);
let currentUrl = getCurrentUrl();
let originUrl = getOriginUrl();
let absoluteUrl = urlStr;
originUrl = removeEndingSlash(originUrl)
currentUrl = removeEndingSlash(currentUrl)
@ -187,7 +187,8 @@ function getAbsoluteUrl(urlStr) {
} else if (urlStr.indexOf('http') !== 0) {
absoluteUrl = currentUrl + '/' + urlStr;
}
absoluteUrl = escapeXMLChars(absoluteUrl);
// TODO is this needed?
// absoluteUrl = escapeXMLChars(absoluteUrl);
return absoluteUrl;
} catch (e) {
console.log('Error:', e);