fixed a bug with absolute source paths in the relative path calculati…

…on for images in the paginate case
IntEL4CoRo · Jan 5, 2024 · bee5845 · bee5845
1 parent 7cdad89
commit bee5845
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/layouts/partials/footer_custom.html b/layouts/partials/footer_custom.html
@@ -31,8 +31,15 @@
     // test for "my-url/page/number/" then correct relative path
     let paginateRelPathCor = new RegExp("^.*\/page\/\\d+\/$").test(window.location.pathname) ? "../../" : "";
 
+    function isUrlAbsolute(url) {
+      return url.indexOf('//') === 0 ? true : url.indexOf('://') === -1 ? false : url.indexOf('.') === -1 ? false : url.indexOf('/') === -1 ? false : url.indexOf(':') > url.indexOf('/') ? false : url.indexOf('://') < url.indexOf('.') ? true : false;
+    }
     function getImageUrl(imgData) {
-      return paginateRelPathCor + imgData["src"];
+      let src = imgData["src"];
+      if (!isUrlAbsolute(src)) {
+        src = paginateRelPathCor + src;
+      }
+      return src;
     }
     function setImage(obj, imgData) {
       obj.src = getImageUrl(imgData);

diff --git a/static/js/main.js b/static/js/main.js
@@ -121,9 +121,16 @@ var main = {
     }
   },
 
+  isUrlAbsolute : function(url) {
+    return url.indexOf('//') === 0 ? true : url.indexOf('://') === -1 ? false : url.indexOf('.') === -1 ? false : url.indexOf('/') === -1 ? false : url.indexOf(':') > url.indexOf('/') ? false : url.indexOf('://') < url.indexOf('.') ? true : false;
+  },
+
   getImgInfo : function() {
     var randNum = Math.floor((Math.random() * main.numImgs) + 1);
-    var src = paginateRelPathCor + main.bigImgEl.attr("data-img-src-" + randNum);
+    var src = main.bigImgEl.attr("data-img-src-" + randNum);
+    if (!main.isUrlAbsolute(src)) {
+      src = paginateRelPathCor + src;
+    }
   var desc = main.bigImgEl.attr("data-img-desc-" + randNum);
   var position = main.bigImgEl.attr("data-img-position-" + randNum);