fix fav, logo handling

ErykKul · Jun 5, 2024 · 01935a8 · 01935a8
1 parent 62d3352
commit 01935a8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/src/js/fileupload2.js b/src/js/fileupload2.js
@@ -136,7 +136,7 @@ function addIconAndLogo(siteUrl) {
                 .attr(
                     'href',
                     siteUrl +
-                    '/javax.faces.resource/images/fav/apple-touch-icon.png.xhtml'))
+                    '/jakarta.faces.resource/images/fav/apple-touch-icon.png.xhtml'))
         .append(
             $('<link/>')
                 .attr('type', 'image/png')
@@ -145,7 +145,7 @@ function addIconAndLogo(siteUrl) {
                 .attr(
                     'href',
                     siteUrl +
-                    '/javax.faces.resource/images/fav/favicon-16x16.png.xhtml'))
+                    '/jakarta.faces.resource/images/fav/favicon-16x16.png.xhtml'))
         .append(
             $('<link/>')
                 .attr('type', 'image/png')
@@ -154,7 +154,7 @@ function addIconAndLogo(siteUrl) {
                 .attr(
                     'href',
                     siteUrl +
-                    '/javax.faces.resource/images/fav/favicon-32x32.png.xhtml'))
+                    '/jakarta.faces.resource/images/fav/favicon-32x32.png.xhtml'))
 
         .append(
             $('<link/>')
@@ -163,7 +163,7 @@ function addIconAndLogo(siteUrl) {
                 .attr(
                     'href',
                     siteUrl +
-                    '/javax.faces.resource/images/fav/safari-pinned-tab.svg.xhtml'))
+                    '/jakarta.faces.resource/images/fav/safari-pinned-tab.svg.xhtml'))
         .append(
             $('<meta/>')
                 .attr('content', '#da532c')
@@ -174,8 +174,7 @@ function addIconAndLogo(siteUrl) {
                 .attr('name', 'theme-color'));
     $('#logo')
         .attr('src', siteUrl + '/logos/preview_logo.svg')
-        .attr('onerror', "handleImageError(this)");
-
+        .attr('onerror', "handleImageError(this,'".concat(siteUrl).concat("')"));
 }
 function initTranslation() {
     initSpanTxt('title-text', 'title');
@@ -1030,16 +1029,4 @@ function getChecksum(blob, cbProgress) {
             }
         });
     });
-}
-function handleImageError(image) {
-    let currentFallback = parseInt(image.getAttribute('data-fallback-index') || '0');
-
-    if(currentFallback == 0){
-        image.src = siteUrl + '/logos/preview_logo.png';
-        image.dataset.fallbackIndex = 1;
-    }
-    else{
-        image.src = 'images/logo_placeholder.png';
-        image.onerror = null;
-    }
 }
diff --git a/src/js/logoHandler.js b/src/js/logoHandler.js
@@ -0,0 +1,12 @@
+function handleImageError(image, siteUrl) {
+    let currentFallback = parseInt(image.getAttribute('data-fallback-index') || '0');
+
+    if(currentFallback == 0){
+        image.src = siteUrl + '/logos/preview_logo.png';
+        image.dataset.fallbackIndex = 1;
+    }
+    else{
+        image.src = 'images/logo_placeholder.png';
+        image.onerror = null;
+    }
+}