Merge branch '172-favicon-should-match-room-logo'

2021-11-23 13:10:11 +01:00 · 2021-11-23 13:10:11 +01:00 · b53fa91e83
commit b53fa91e83
parent 38e6dfa0e6 f042e61154
3 changed files with 24 additions and 4 deletions
--- a/public/index.html
+++ b/public/index.html
@ -4,7 +4,7 @@
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" id="favicon" href="<%= BASE_URL %>favicon.ico">
    <title><%= htmlWebpackPlugin.options.title %></title>
  </head>
  <body>
--- a/src/App.vue
+++ b/src/App.vue
@ -127,6 +127,16 @@ export default {
      }
      return title;
    },
+
+    favicon() {
+      var favicon = undefined;
+      if (this.$route.meta.includeFavicon) {
+        if (this.$matrix.currentRoom) {
+          favicon = this.$matrix.currentRoom.avatar || 'favicon.ico';
+        }
+      }
+      return favicon;
+    },
  },
  watch: {
    "$i18n.locale": {
@ -149,6 +159,13 @@ export default {
      },
      immediate: true,
    },
+
+    favicon: {
+      handler(favicon) {
+        document.getElementById("favicon").setAttribute('href', favicon);
+      },
+      immediate: true,
+    },
  },
 };
 </script>
--- a/src/router/index.js
+++ b/src/router/index.js
@ -22,7 +22,8 @@ const routes = [
    name: 'Chat',
    component: Chat,
    meta: {
-      includeRoom: true
+      includeRoom: true,
+      includeFavicon: true
    }
  },
  {
@ -32,7 +33,8 @@ const routes = [
    props: true,
    meta: {
      title: 'Info',
-      includeRoom: true
+      includeRoom: true,
+      includeFavicon: true
    }
  },
  {
@ -40,7 +42,8 @@ const routes = [
    name: 'Profile',
    component: Profile,
    meta: {
-      title: 'Profile'
+      title: 'Profile',
+      includeFavicon: true
    }
  },
  {