Merge branch 'gdcc:main' into main

ErykKul · Aug 23, 2024 · 36a644f · 36a644f
2 parents 273d6ef + 3be8983
commit 36a644f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/src/dvwebloader.html b/src/dvwebloader.html
@@ -6,6 +6,8 @@
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/core.js"></script>
         <script type="module" src="js/fileupload2.js"></script>
+        <script src="js/logoHandler.js"></script>
+
     </head>
     <body>
         <main>

diff --git a/src/images/logo_placeholder.png b/src/images/logo_placeholder.png
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')
@@ -172,8 +172,9 @@ function addIconAndLogo(siteUrl) {
             $('<meta/>')
                 .attr('content', '#ffffff')
                 .attr('name', 'theme-color'));
-    $('#logo').attr('src', siteUrl + '/logos/preview_logo.png');
-
+    $('#logo')
+        .attr('src', siteUrl + '/logos/preview_logo.svg')
+        .attr('onerror', "handleImageError(this,'".concat(siteUrl).concat("')"));
 }
 function initTranslation() {
     initSpanTxt('title-text', 'title');
@@ -1028,4 +1029,4 @@ function getChecksum(blob, cbProgress) {
             }
         });
     });
-}
+}
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;
+    }
+}