Merge branch 'develop' of github.com:bouvet-apps/app-favicon into rel…

…ease/2.0.3
bouvet-apps · Aug 22, 2024 · 0fe589e · 0fe589e
2 parents 8008067 + 6c3c4b0
commit 0fe589e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 20 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Gradle Project settings
 projectName = favicon
-version = 2.0.2
+version = 2.0.3
 
 # XP App values
 appDisplayName = Favicon

diff --git a/src/main/resources/site/processors/favicon.js b/src/main/resources/site/processors/favicon.js
@@ -15,7 +15,8 @@ var imageTypes = {
 exports.responseProcessor = function (req, res) {
   var siteConfig = portal.getSiteConfig();
   var imageId = siteConfig.favicon;
-  var domainName = req.host
+  var domainName = req.host;
+  const mode = req.mode;
 
   if (!imageId) {
     return res;
@@ -28,31 +29,38 @@ exports.responseProcessor = function (req, res) {
     res.pageContributions.headEnd = [headEnd];
   }
 
-  res.pageContributions.headEnd.push(createMetaLinks(siteConfig, domainName));
+  res.pageContributions.headEnd.push(createMetaLinks(siteConfig, domainName, mode));
 
   return res;
 };
 
-function createMetaLinks(siteConfig, domainName) {
+function createMetaLink(size, siteConfig, rel, type) {
   var createImageUrl = getCreateImageFn(siteConfig.favicon);
+  var imageUrl = createImageUrl('square(' + size + ')', type);
+  var mimeType = imageTypes[(type || 'jpg').toLowerCase()];
+  var typeStr = mimeType ? 'type="' + mimeType + '"' : '';
+  var sizes = 'sizes="' + size + 'x' + size + '" ';
+  return '<link rel="' + (rel || 'icon') + '" ' + sizes + 'href="' + imageUrl + '" ' + typeStr + '>';
+}
+
+function iconLink(siteConfig) {
+  return [createMetaLink(64, siteConfig, 'shortcut icon', 'png')]
+    .concat(sizes.map(function (size, siteConfig) {
+      return createMetaLink(size, siteConfig, 'apple-touch-icon');
+    }))
+    .concat(altSizes.map(function (size, siteConfig) {
+      return createMetaLink(size, siteConfig, 'icon', 'png');
+    }))
+    .join('\n');
+}
+
+function createMetaLinks(siteConfig, domainName, mode) {
   var cache = getCache(siteConfig).cache;
-  return cache.get('favicon-image-generator-cache-' + domainName, function () {
-    return [createMetaLink(64, 'shortcut icon', 'png')]
-      .concat(sizes.map(function (size) {
-        return createMetaLink(size, 'apple-touch-icon');
-      }))
-      .concat(altSizes.map(function (size) {
-        return createMetaLink(size, 'icon', 'png');
-      }))
-      .join('\n');
-  });
 
-  function createMetaLink(size, rel, type) {
-    var imageUrl = createImageUrl('square(' + size + ')', type);
-    var mimeType = imageTypes[(type || 'jpg').toLowerCase()];
-    var typeStr = mimeType ? 'type="' + mimeType + '"' : '';
-    var sizes = 'sizes="' + size + 'x' + size + '" ';
-    return '<link rel="' + (rel || 'icon') + '" ' + sizes + 'href="' + imageUrl + '" ' + typeStr + ' />';
+  if (mode === "live") {
+    return cache.get('favicon-image-generator-cache-' + domainName, () => iconLink(siteConfig));
+  } else {
+    return iconLink(siteConfig);
   }
 }