Merge branch 'dev'

mbnuqw · Sep 3, 2019 · 8415536 · 8415536
2 parents 44f6633 + 64fe992
commit 8415536
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 6 deletions.
diff --git a/addon/manifest.json b/addon/manifest.json
@@ -8,7 +8,7 @@
   },
   "author": "mbnuqw",
   "name": "__MSG_ExtName__",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "default_locale": "en",
   "description": "__MSG_ExtDesc__",
   "homepage_url": "https://github.com/mbnuqw/sidebery",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sidebery",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Manage your tabs and bookmarks in sidebar",
   "main": "index.js",
   "scripts": {

diff --git a/src/sidebar/actions/tabs.js b/src/sidebar/actions/tabs.js
@@ -1411,6 +1411,13 @@ function resetUpdateGroupTabTimeout() {
   if (updateGroupTabTimeouit) clearTimeout(updateGroupTabTimeouit)
 }
 
+function updateActiveGroupPage() {
+  let activeTab = this.state.tabs.find(t => t.active)
+  if (Utils.isGroupUrl(activeTab.url)) {
+    this.actions.updateGroupTab(updateGroupTab)
+  }
+}
+
 export default {
   loadTabs,
   getOrderNormMoves,
@@ -1459,6 +1466,7 @@ export default {
   getGroupTab,
   updateGroupTab,
   resetUpdateGroupTabTimeout,
+  updateActiveGroupPage,
 
   createTabAfter,
   updateTabsTree,

diff --git a/src/sidebar/sidebar.js b/src/sidebar/sidebar.js
@@ -75,6 +75,7 @@ export default new Vue({
     Actions.saveTabsTree()
 
     Actions.connectToBG()
+    Actions.updateActiveGroupPage()
   },
 
   mounted() {

diff --git a/src/styles/themes/default/pinned-tab.styl b/src/styles/themes/default/pinned-tab.styl
@@ -217,7 +217,7 @@
   .PinnedTab .audio-badge
     pos(17px, same)
 
-.PinnedTab[data-audible] .audio-badge > svg.-loud
+.PinnedTab[data-audible]:not([data-muted]) .audio-badge > svg.-loud
 .PinnedTab[data-muted] .audio-badge > svg.-mute
   opacity: 1
 

diff --git a/src/styles/themes/default/tabs.tab.styl b/src/styles/themes/default/tabs.tab.styl
@@ -125,7 +125,7 @@
   &:active
     opacity: .5
 
-.Tab[data-audible] svg.-loud
+.Tab[data-audible]:not([data-muted]) svg.-loud
 .Tab[data-muted] svg.-mute
   opacity: 1
 

diff --git a/src/styles/themes/tactile/pinned-tab.styl b/src/styles/themes/tactile/pinned-tab.styl
@@ -247,7 +247,7 @@
   .PinnedTab .audio-badge
     pos(17px, 16px)
 
-.PinnedTab[data-audible] .audio-badge > svg.-loud
+.PinnedTab[data-audible]:not([data-muted]) .audio-badge > svg.-loud
 .PinnedTab[data-muted] .audio-badge > svg.-mute
   opacity: 1
 

diff --git a/src/styles/themes/tactile/tabs.tab.styl b/src/styles/themes/tactile/tabs.tab.styl
@@ -158,7 +158,7 @@
   &:active
     opacity: .5
 
-.Tab[data-audible] svg.-loud
+.Tab[data-audible]:not([data-muted]) svg.-loud
 .Tab[data-muted] svg.-mute
   opacity: 1