From 57e0d24fecaa9571356159392bc3e1a2ca9e9ab7 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Tue, 26 Mar 2019 19:50:14 +0500
Subject: [PATCH 01/22] Fixed: Preserve tab pinned state on reopening caused by
 Include/Exclude rules

---
 src/sidebar/proxy.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/sidebar/proxy.js b/src/sidebar/proxy.js
index 9df3f2ef..37a48cdd 100644
--- a/src/sidebar/proxy.js
+++ b/src/sidebar/proxy.js
@@ -18,6 +18,7 @@ export default function reqHandler(info) {
           url: info.url,
           cookieStoreId: rule.ctx,
           active: tab.active,
+          pinned: tab.pinned,
         })
         browser.tabs.remove(tab.id)
         return
@@ -36,6 +37,7 @@ export default function reqHandler(info) {
             windowId: State.windowId,
             url: info.url,
             active: tab.active,
+            pinned: tab.pinned,
           })
           browser.tabs.remove(tab.id)
           return

From a32b6f40309cc1b4f141faa3090775a947354cf6 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Tue, 26 Mar 2019 20:12:48 +0500
Subject: [PATCH 02/22] Refactoring

---
 src/sidebar/actions/panels.js | 2 +-
 src/sidebar/proxy.js          | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/sidebar/actions/panels.js b/src/sidebar/actions/panels.js
index 68215385..e60baec2 100644
--- a/src/sidebar/actions/panels.js
+++ b/src/sidebar/actions/panels.js
@@ -273,7 +273,7 @@ export default {
             rule = new RegExp(rule.slice(1, rule.length - 1))
           }
 
-          state.includeHostsRules.push({ ctx: ctr.id, host: rule })
+          state.includeHostsRules.push({ ctx: ctr.id, value: rule })
         }
       }
 
diff --git a/src/sidebar/proxy.js b/src/sidebar/proxy.js
index 37a48cdd..be466fb9 100644
--- a/src/sidebar/proxy.js
+++ b/src/sidebar/proxy.js
@@ -1,6 +1,7 @@
 import State from './store.state'
 
 export default function reqHandler(info) {
+  if (!State.tabsMap) return
   let tab = State.tabsMap[info.tabId]
   if (!tab) return
 
@@ -9,8 +10,8 @@ export default function reqHandler(info) {
     // Inlude rules
     for (let rule of State.includeHostsRules) {
       let ok
-      if ((typeof rule.host)[0] === 's') ok = info.url.indexOf(rule.host) !== -1
-      else ok = rule.host.test(info.url)
+      if ((typeof rule.value)[0] === 's') ok = info.url.indexOf(rule.value) !== -1
+      else ok = rule.value.test(info.url)
 
       if (ok && tab.cookieStoreId !== rule.ctx) {
         browser.tabs.create({

From 21add50e08f36bf293706d6a401a3f78e898eda1 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Tue, 26 Mar 2019 20:27:54 +0500
Subject: [PATCH 03/22] Fixed: Disable request handler in private window

---
 src/sidebar/actions/panels.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/sidebar/actions/panels.js b/src/sidebar/actions/panels.js
index e60baec2..47998db9 100644
--- a/src/sidebar/actions/panels.js
+++ b/src/sidebar/actions/panels.js
@@ -316,7 +316,8 @@ export default {
   /**
    * Set request handler
    */
-  turnOnReqHandler() {
+  turnOnReqHandler({ state }) {
+    if (state.private) return
     if (!browser.proxy.onRequest.hasListener(ReqHandler)) {
       browser.proxy.onRequest.addListener(ReqHandler, { urls: ['<all_urls>'] })
     }
@@ -325,7 +326,8 @@ export default {
   /**
    * Unset request handler
    */
-  turnOffReqHandler() {
+  turnOffReqHandler({ state }) {
+    if (state.private) return
     if (browser.proxy.onRequest.hasListener(ReqHandler)) {
       browser.proxy.onRequest.removeListener(ReqHandler)
     }

From 3a02887550699f8e46c4381160e8d99984de171f Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Tue, 26 Mar 2019 21:06:51 +0500
Subject: [PATCH 04/22] Fixed: Unclickable mute icon of pinned tab

---
 src/sidebar/components/panels/pinned-tab.vue | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/sidebar/components/panels/pinned-tab.vue b/src/sidebar/components/panels/pinned-tab.vue
index c0f220ca..4786800c 100644
--- a/src/sidebar/components/panels/pinned-tab.vue
+++ b/src/sidebar/components/panels/pinned-tab.vue
@@ -31,9 +31,9 @@
     .loading-spinner
       each n in [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
         .spinner-stick(class='spinner-stick-' + n)
-    .audio-badge(@mousedown.stop="", @click="$store.dispatch('remuteTabs', [tab.id])")
-      svg.-loud: use(xlink:href="#icon_loud")
-      svg.-mute: use(xlink:href="#icon_mute")
+  .audio-badge(@mousedown.stop="", @click="$store.dispatch('remuteTabs', [tab.id])")
+    svg.-loud: use(xlink:href="#icon_loud")
+    svg.-mute: use(xlink:href="#icon_mute")
   .ctx(v-if="ctx && ctxColor", :style="{background: ctxColor}")
   .title(v-if="withTitle") {{tab.title}}
 </template>
@@ -480,6 +480,8 @@ export default {
     padding-left: 1px
   .PinnedTab:before
     box-shadow: 0 -1px 0 0 var(--tabs-update-badge-bg)
+  .PinnedTab .audio-badge
+    pos(l: 16px)
 
 #root.-pinned-tabs-panel
 #root.-pinned-tabs-top
@@ -634,10 +636,10 @@ export default {
   fill: var(--false-fg)
 
 // --- Audio badge
-.PinnedTab .fav > .audio-badge
+.PinnedTab .audio-badge
   box(absolute)
   size(10px, same)
-  pos(b: -3px, r: -3px)
+  pos(calc(50% + 1px), 17px)
   border-radius: 50%
   opacity: 0
   z-index: -1
@@ -660,17 +662,17 @@ export default {
       #000000 7.5px,
       #000000
     )
-  .fav > .audio-badge
-    z-index: 2
+  .audio-badge
+    z-index: 200
     opacity: 1
     transform: scale(1, 1)
 
 .PinnedTab[data-audible]
-  .fav > .audio-badge > svg.-loud
+  .audio-badge > svg.-loud
     opacity: 1
 
 .PinnedTab[data-muted]
-  .fav > .audio-badge > svg.-mute
+  .audio-badge > svg.-mute
     opacity: 1
 
 // --- Loaded fx

From 3c5b1ac04160dba05d4769bb15ec5e82296e7257 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Tue, 26 Mar 2019 21:18:04 +0500
Subject: [PATCH 05/22] Refactoring

---
 src/sidebar/components/panels/tabs.tab.vue | 75 +++-------------------
 1 file changed, 10 insertions(+), 65 deletions(-)

diff --git a/src/sidebar/components/panels/tabs.tab.vue b/src/sidebar/components/panels/tabs.tab.vue
index ff45d5a1..2997cb3e 100644
--- a/src/sidebar/components/panels/tabs.tab.vue
+++ b/src/sidebar/components/panels/tabs.tab.vue
@@ -501,89 +501,24 @@ export default {
 
   &[lvl="1"]
     padding-left: var(--tabs-indent)
-    > .lvl-wrapper:before
-      box-shadow: calc(var(--tabs-indent) / -2) 0 0 0 var(--inactive-fg)
   &[lvl="2"]
     padding-left: calc(var(--tabs-indent) * 2)
-    > .lvl-wrapper:before
-      box-shadow: calc(var(--tabs-indent) / -2) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -1.5) 0 0 0 var(--inactive-fg)
   &[lvl="3"]
     padding-left: calc(var(--tabs-indent) * 3)
-    > .lvl-wrapper:before
-      box-shadow: calc(var(--tabs-indent) / -2) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -1.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -2.5) 0 0 0 var(--inactive-fg)
   &[lvl="4"]
     padding-left: calc(var(--tabs-indent) * 4)
-    > .lvl-wrapper:before
-      box-shadow: calc(var(--tabs-indent) / -2) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -1.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -2.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -3.5) 0 0 0 var(--inactive-fg)
   &[lvl="5"]
     padding-left: calc(var(--tabs-indent) * 5)
-    > .lvl-wrapper:before
-      box-shadow: calc(var(--tabs-indent) / -2) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -1.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -2.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -3.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -4.5) 0 0 0 var(--inactive-fg)
   &[lvl="6"]
     padding-left: calc(var(--tabs-indent) * 6)
-    > .lvl-wrapper:before
-      box-shadow: calc(var(--tabs-indent) / -2) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -1.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -2.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -3.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -4.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -5.5) 0 0 0 var(--inactive-fg)
   &[lvl="7"]
     padding-left: calc(var(--tabs-indent) * 7)
-    > .lvl-wrapper:before
-      box-shadow: calc(var(--tabs-indent) / -2) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -1.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -2.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -3.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -4.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -5.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -6.5) 0 0 0 var(--inactive-fg)
   &[lvl="8"]
     padding-left: calc(var(--tabs-indent) * 8)
-    > .lvl-wrapper:before
-      box-shadow: calc(var(--tabs-indent) / -2) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -1.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -2.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -3.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -4.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -5.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -6.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -7.5) 0 0 0 var(--inactive-fg)
   &[lvl="9"]
     padding-left: calc(var(--tabs-indent) * 9)
-    > .lvl-wrapper:before
-      box-shadow: calc(var(--tabs-indent) / -2) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -1.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -2.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -3.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -4.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -5.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -6.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -7.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -8.5) 0 0 0 var(--inactive-fg)
   &[lvl="10"]
     padding-left: calc(var(--tabs-indent) * 10)
-    > .lvl-wrapper:before
-      box-shadow: calc(var(--tabs-indent) / -2) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -1.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -2.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -3.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -4.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -5.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -6.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -7.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -8.5) 0 0 0 var(--inactive-fg),
-                  calc(var(--tabs-indent) * -9.5) 0 0 0 var(--inactive-fg)
 
   &[is-parent] .fav:hover
     > .exp
@@ -715,6 +650,16 @@ export default {
     opacity: .8
 #root.-tabs-lvl-marks .Tab .lvl-wrapper:before
   box(block)
+  box-shadow: calc(var(--tabs-indent) / -2) 0 0 0 var(--inactive-fg),
+              calc(var(--tabs-indent) * -1.5) 0 0 0 var(--inactive-fg),
+              calc(var(--tabs-indent) * -2.5) 0 0 0 var(--inactive-fg),
+              calc(var(--tabs-indent) * -3.5) 0 0 0 var(--inactive-fg),
+              calc(var(--tabs-indent) * -4.5) 0 0 0 var(--inactive-fg),
+              calc(var(--tabs-indent) * -5.5) 0 0 0 var(--inactive-fg),
+              calc(var(--tabs-indent) * -6.5) 0 0 0 var(--inactive-fg),
+              calc(var(--tabs-indent) * -7.5) 0 0 0 var(--inactive-fg),
+              calc(var(--tabs-indent) * -8.5) 0 0 0 var(--inactive-fg),
+              calc(var(--tabs-indent) * -9.5) 0 0 0 var(--inactive-fg)
 
 // --- Drag layer ---
 .Tab .drag-layer

From 0683476a16e10128af7161c7976440d6e1a99637 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Wed, 27 Mar 2019 16:23:40 +0500
Subject: [PATCH 06/22] Cleanup

---
 src/sidebar/actions/sync.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/sidebar/actions/sync.js b/src/sidebar/actions/sync.js
index 64693852..14fb2bcf 100644
--- a/src/sidebar/actions/sync.js
+++ b/src/sidebar/actions/sync.js
@@ -119,7 +119,6 @@ export default {
   updateSyncPanels({ state, getters }, synced) {
     if (!synced) return
     if (synced.id === state.localID) return
-    // console.log('[DEBUG] SYNC ACTION updateSyncPanels');
 
     // Check if this data already used
     if (state.synced[synced.id] && state.synced[synced.id] >= synced.time) return

From 52402ba3d31986fde937bf92a8d028aa6d758093 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Wed, 27 Mar 2019 19:07:27 +0500
Subject: [PATCH 07/22] Fixed: Preserve tree structure on dropping bookmarks or
 tabs with groupOnOpen option disabled

---
 src/sidebar/actions/tabs.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/sidebar/actions/tabs.js b/src/sidebar/actions/tabs.js
index 4279a944..2dfd42c0 100644
--- a/src/sidebar/actions/tabs.js
+++ b/src/sidebar/actions/tabs.js
@@ -800,6 +800,9 @@ export default {
             pinned: pin,
           })
           oldNewMap[node.id] = info.id
+          if (state.tabsMap[info.id] && opener) {
+            state.tabsMap[info.id].parentId = opener
+          }
         }
 
         // Remove source tabs

From 7f5023729ba2fee7490d0063e05a850245c36c28 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Wed, 27 Mar 2019 19:53:08 +0500
Subject: [PATCH 08/22] Fixed: Update tab height value after changing it in
 styles editor

---
 src/sidebar/actions/styles.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/sidebar/actions/styles.js b/src/sidebar/actions/styles.js
index 8003eb3f..d0ee51fc 100644
--- a/src/sidebar/actions/styles.js
+++ b/src/sidebar/actions/styles.js
@@ -61,6 +61,7 @@ export default {
     const rootEl = document.getElementById('root')
     Vue.set(state.customStyles, key, val)
     rootEl.style.setProperty(Utils.CSSVar(key), val)
+    setTimeout(() => EventBus.$emit('dynVarChange'), 256)
   },
 
   /**
@@ -70,5 +71,6 @@ export default {
     const rootEl = document.getElementById('root')
     Vue.set(state.customStyles, key, null)
     rootEl.style.removeProperty(Utils.CSSVar(key))
+    setTimeout(() => EventBus.$emit('dynVarChange'), 256)
   },
 }
\ No newline at end of file

From eb957aec1bfb8314bd2b0911baac127e275560ef Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Wed, 27 Mar 2019 21:10:27 +0500
Subject: [PATCH 09/22] Fixed: Scroll to active tab on initialization

---
 src/sidebar/actions/styles.js |  3 +--
 src/sidebar/actions/tabs.js   | 13 +++++++++++++
 src/sidebar/index.js          |  5 +++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/sidebar/actions/styles.js b/src/sidebar/actions/styles.js
index d0ee51fc..eb469d2c 100644
--- a/src/sidebar/actions/styles.js
+++ b/src/sidebar/actions/styles.js
@@ -21,8 +21,7 @@ export default {
     }
 
     state.customStyles = loadedStyles
-
-    setTimeout(() => EventBus.$emit('dynVarChange'), 256)
+    EventBus.$emit('dynVarChange')
   },
 
   /**
diff --git a/src/sidebar/actions/tabs.js b/src/sidebar/actions/tabs.js
index 2dfd42c0..829fcee1 100644
--- a/src/sidebar/actions/tabs.js
+++ b/src/sidebar/actions/tabs.js
@@ -145,6 +145,19 @@ export default {
     }, delay)
   },
 
+  /**
+   * Scroll to active tab
+   */
+  scrollToActiveTab({ state, getters }) {
+    const activePanel = getters.panels[state.panelIndex]
+    if (activePanel && activePanel.tabs) {
+      const activeTab = activePanel.tabs.find(t => t.active)
+      if (activeTab) {
+        EventBus.$emit('scrollToActiveTab', state.panelIndex, activeTab.id)
+      }
+    }
+  },
+
   /**
    * Create new tab in current window
    */
diff --git a/src/sidebar/index.js b/src/sidebar/index.js
index 24f91f79..ebdceaad 100644
--- a/src/sidebar/index.js
+++ b/src/sidebar/index.js
@@ -87,9 +87,10 @@ export default new Vue({
     await Store.dispatch('loadState')
     await Store.dispatch('loadContainers')
     await Store.dispatch('loadTabs')
-    Store.dispatch('loadStyles')
-    Store.dispatch('loadKeybindings')
     await Store.dispatch('loadLocalID')
+    await Store.dispatch('loadStyles')
+    Store.dispatch('scrollToActiveTab')
+    Store.dispatch('loadKeybindings')
     Store.dispatch('loadSyncPanels')
     Store.dispatch('loadSnapshots')
     Store.dispatch('loadFavicons')

From 433d4e513dd4efb6bb2c19adf4f434d2d7c72769 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Wed, 27 Mar 2019 21:38:39 +0500
Subject: [PATCH 10/22] Fixed: z-index of tab's close button

---
 src/sidebar/components/panels/tabs.tab.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/sidebar/components/panels/tabs.tab.vue b/src/sidebar/components/panels/tabs.tab.vue
index 2997cb3e..4d480059 100644
--- a/src/sidebar/components/panels/tabs.tab.vue
+++ b/src/sidebar/components/panels/tabs.tab.vue
@@ -491,7 +491,6 @@ export default {
       color: var(--tabs-fg-hover)
     .close
       opacity: 1
-      z-index: 20
   &:active
   &[is-active]:active
     background-color: var(--tabs-bg-active)
@@ -879,7 +878,7 @@ export default {
   size(31px)
   height: var(--tabs-height)
   cursor: pointer
-  z-index: -1
+  z-index: 20
   opacity: 0
   &:hover > svg
     fill: #ea4335

From 6ebd786d30cbcae21838dcb947dfd1cef91f07bf Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Wed, 27 Mar 2019 21:50:06 +0500
Subject: [PATCH 11/22] Fixed: Removed 'group' option from context menu of
 pinned tab

---
 src/sidebar/store.actions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sidebar/store.actions.js b/src/sidebar/store.actions.js
index 2454c459..e727350b 100644
--- a/src/sidebar/store.actions.js
+++ b/src/sidebar/store.actions.js
@@ -140,7 +140,7 @@ export default {
         })
       }
 
-      if (state.tabsTree) {
+      if (state.tabsTree && !node.pinned) {
         menu.add('tab.group', 'groupTabs', state.selected)
       }
 

From 416b459585704c62481a4cae7b850f2787b881f7 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Thu, 28 Mar 2019 09:38:11 +0500
Subject: [PATCH 12/22] Build: added ff-esr

---
 .gitignore                       | 4 +++-
 build/debug.js                   | 4 ++--
 build/profile-esr/__preserve-dir | 1 +
 package.json                     | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 build/profile-esr/__preserve-dir

diff --git a/.gitignore b/.gitignore
index 9afe5dc9..c32604fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,6 @@ build/profile-ru/*
 build/profile-en/*
 !build/profile-en/__preserve-dir
 build/profile-beta/*
-!build/profile-beta/__preserve-dir
\ No newline at end of file
+!build/profile-beta/__preserve-dir
+build/profile-esr/*
+!build/profile-esr/__preserve-dir
\ No newline at end of file
diff --git a/build/debug.js b/build/debug.js
index 463dae6d..a734f80d 100644
--- a/build/debug.js
+++ b/build/debug.js
@@ -2,7 +2,7 @@
 /*eslint no-console: off*/
 const { spawn, spawnSync } = require('child_process')
 const { scripts } = require('../package.json')
-const LANG = process.argv[process.argv.length - 1]
+const VER = process.argv[process.argv.length - 1]
 
 const colors = {
   reset: '\x1b[0m',
@@ -36,7 +36,7 @@ const PERM_HIDE = scripts['dev.perm.hide'].split(' ')
 const PERM_HIDE_CMD = PERM_HIDE[0]
 const PERM_HIDE_OPT = PERM_HIDE.slice(1)
 
-const EXT = scripts['dev.ext.' + LANG].split(' ')
+const EXT = scripts['dev.ext.' + VER].split(' ')
 const EXT_CMD = EXT[0]
 const EXT_OPT = EXT.slice(1)
 
diff --git a/build/profile-esr/__preserve-dir b/build/profile-esr/__preserve-dir
new file mode 100644
index 00000000..e5418e0b
--- /dev/null
+++ b/build/profile-esr/__preserve-dir
@@ -0,0 +1 @@
+preserve-dir
\ No newline at end of file
diff --git a/package.json b/package.json
index 0e99425e..15a3cef4 100644
--- a/package.json
+++ b/package.json
@@ -10,8 +10,10 @@
     "dev.perm.hide": "parcel watch ./src/permissions/tab-hide.html -d ./addon/permissions/ --public-url ./ --no-autoinstall",
     "dev.ext.en": "web-ext run --source-dir ./addon -f firefox-beta --keep-profile-changes --firefox-profile ./build/profile-beta",
     "dev.ext.ru": "web-ext run --source-dir ./addon -f firefox --keep-profile-changes --firefox-profile ./build/profile-ru",
+    "dev.ext.esr": "web-ext run --source-dir ./addon -f firefox-esr --keep-profile-changes --firefox-profile ./build/profile-esr",
     "dev": "node ./build/debug.js en",
     "dev.ru": "node ./build/debug.js ru",
+    "dev.esr": "node ./build/debug.js esr",
     "build.sidebar": "parcel build ./src/sidebar/index.html -d ./addon/sidebar/ --public-url ./ --no-autoinstall --no-source-maps",
     "build.group": "parcel build ./src/group/group.html -d ./addon/group/ --public-url ./ --no-autoinstall --no-source-maps",
     "build.perm.url": "parcel build ./src/permissions/all-urls.html -d ./addon/permissions/ --public-url ./ --no-autoinstall --no-source-maps",

From 0f56b425f352f1342f291bd3c68f89d96f432542 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Thu, 28 Mar 2019 09:38:50 +0500
Subject: [PATCH 13/22] Fixed: Update favicon on url-change

---
 src/sidebar/actions/tabs.js                |  2 ++
 src/sidebar/components/index.vue           | 27 +++++++++++++++++-----
 src/sidebar/components/panels/tabs.tab.vue | 12 ++++------
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/sidebar/actions/tabs.js b/src/sidebar/actions/tabs.js
index 829fcee1..1581073b 100644
--- a/src/sidebar/actions/tabs.js
+++ b/src/sidebar/actions/tabs.js
@@ -41,7 +41,9 @@ export default {
       t.parentId = -1
       t.invisible = false
       t.lvl = 0
+      t.host = t.url.split('/')[2] || ''
       state.tabsMap[t.id] = t
+      if (!t.favIconUrl || t.favIconUrl.startsWith('chrome:')) t.favIconUrl = ''
     })
     state.tabs = tabs
 
diff --git a/src/sidebar/components/index.vue b/src/sidebar/components/index.vue
index c1bfc7df..1678ac8d 100644
--- a/src/sidebar/components/index.vue
+++ b/src/sidebar/components/index.vue
@@ -1245,6 +1245,9 @@ export default {
       tab.parentId = -1
       tab.lvl = 0
       tab.invisible = false
+      tab.favIconUrl = ''
+      tab.host = ''
+      if (tab.url) tab.host = tab.url.split('/')[2] || ''
 
       // Put new tab in tabs list
       State.tabsMap[tab.id] = tab
@@ -1285,9 +1288,17 @@ export default {
      */
     onUpdatedTab(tabId, change, tab) {
       if (tab.windowId !== State.windowId) return
-      if (!State.tabs[tab.index]) return
-      if (State.tabs[tab.index].id !== tabId) return
-      const localTab = State.tabs[tab.index]
+
+      const localTab = State.tabsMap[tabId]
+      if (!localTab) return
+
+      // Url
+      if (change.hasOwnProperty('url')) {
+        if (change.url !== localTab.url) {
+          localTab.host = change.url.split('/')[2] || ''
+          if (change.url.startsWith('about:')) localTab.favIconUrl = ''
+        }
+      }
 
       // Loaded
       if (change.hasOwnProperty('status')) {
@@ -1298,9 +1309,13 @@ export default {
 
       // Handle favicon change
       // If favicon is base64 string - store it in cache
-      if (change.favIconUrl && change.favIconUrl.startsWith('data:')) {
-        const hostname = tab.url.split('/')[2]
-        Store.dispatch('setFavicon', { hostname, icon: change.favIconUrl })
+      if (change.favIconUrl) {
+        if (change.favIconUrl.startsWith('data:')) {
+          const hostname = tab.url.split('/')[2]
+          Store.dispatch('setFavicon', { hostname, icon: change.favIconUrl })
+        } else if (change.favIconUrl.startsWith('chrome:')) {
+          change.favIconUrl = ''
+        }
       }
 
       // Handle unpinned tab
diff --git a/src/sidebar/components/panels/tabs.tab.vue b/src/sidebar/components/panels/tabs.tab.vue
index 4d480059..40812b97 100644
--- a/src/sidebar/components/panels/tabs.tab.vue
+++ b/src/sidebar/components/panels/tabs.tab.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
 .Tab(:is-active="tab.active"
   :data-status="tab.status"
-  :data-no-fav="!favicon || faviErr"
+  :data-no-fav="!favicon"
   :data-audible="tab.audible"
   :data-muted="tab.mutedInfo.muted"
   :data-pinned="tab.pinned"
@@ -87,13 +87,8 @@ export default {
     },
 
     favicon() {
-      if (this.tab.favIconUrl) return this.tab.favIconUrl
-      else if (this.tab.url) {
-        let hn = this.tab.url.split('/')[2]
-        if (!hn) return
-        return State.favicons[hn]
-      }
-      return undefined
+      if (this.tab.status === 'loading') return State.favicons[this.tab.host]
+      else return State.favicons[this.tab.host] || this.tab.favIconUrl
     },
 
     offsetStyle() {
@@ -581,6 +576,7 @@ export default {
     .fav > img
       opacity: 0
       transform: translateY(-4px)
+      transition: none
 
   &[data-audible]
     .audio

From 80c78b64ae39bef402f9c5000bac6a8459ec89fa Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Thu, 28 Mar 2019 11:36:30 +0500
Subject: [PATCH 14/22] Minor fix

---
 src/sidebar/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/sidebar/index.js b/src/sidebar/index.js
index ebdceaad..5f1e6384 100644
--- a/src/sidebar/index.js
+++ b/src/sidebar/index.js
@@ -5,6 +5,7 @@ import Dict from '../mixins/dict'
 import Store from './store'
 import State from './store.state'
 
+if (!State.tabsMap) State.tabsMap = []
 Vue.mixin(Dict)
 
 export default new Vue({

From 18b81dc103ff3418e37f536202691f696dd0c6a4 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Thu, 28 Mar 2019 12:07:06 +0500
Subject: [PATCH 15/22] Fixed: Favicons for about:xxx pages

---
 src/sidebar/components/panels/tabs.tab.vue | 3 +++
 src/sidebar/index.html                     | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/src/sidebar/components/panels/tabs.tab.vue b/src/sidebar/components/panels/tabs.tab.vue
index 40812b97..c9244fd4 100644
--- a/src/sidebar/components/panels/tabs.tab.vue
+++ b/src/sidebar/components/panels/tabs.tab.vue
@@ -108,6 +108,9 @@ export default {
       if (JPG_RE.test(this.tab.url)) return '#icon_jpg'
       if (PDF_RE.test(this.tab.url)) return '#icon_pdf'
       if (this.tab.url.startsWith('file:')) return '#icon_local_file'
+      if (this.tab.url.startsWith('about:preferences')) return '#icon_pref'
+      if (this.tab.url.startsWith('about:addons')) return '#icon_addons'
+      if (this.tab.url.startsWith('about:performance')) return '#icon_perf'
       return '#icon_ff'
     },
   },
diff --git a/src/sidebar/index.html b/src/sidebar/index.html
index b4524e07..a5e7e437 100644
--- a/src/sidebar/index.html
+++ b/src/sidebar/index.html
@@ -18,6 +18,12 @@
     <svg id="icon_pdf" xmlns="http://www.w3.org/2000/svg"><path d="M1.7 9.65a1.12 1.12 0 0 0 .88.39 1 1 0 0 0 .43-.1.87.87 0 0 0 .34-.3c.1-.13.17-.3.23-.53.05-.22.08-.48.08-.8 0-.3-.02-.55-.07-.75-.04-.2-.1-.37-.18-.5a.69.69 0 0 0-.65-.35c-.24 0-.45.04-.6.13-.17.1-.32.23-.47.4v2.41zm-.11-3.43c.22-.24.47-.43.75-.58a2.1 2.1 0 0 1 1.83-.03c.25.13.47.32.65.57.19.24.33.55.43.91a4.32 4.32 0 0 1-.02 2.4 2.9 2.9 0 0 1-.5.95 2.14 2.14 0 0 1-1.75.85c-.3 0-.54-.05-.74-.13-.2-.08-.38-.2-.55-.34V13H0V5.52h1.05c.21 0 .35.1.41.28l.13.42zM9.72 7.04a1.04 1.04 0 0 0-.41-.3c-.15-.05-.31-.08-.47-.08a.9.9 0 0 0-.78.4c-.1.13-.17.3-.22.52a3.69 3.69 0 0 0-.02 1.55c.04.2.1.37.18.5.08.13.17.22.28.27.11.06.24.08.37.08.12 0 .23 0 .33-.03a1.26 1.26 0 0 0 .52-.27l.22-.23v-2.4zM11.42 3v8.2h-1.05c-.22 0-.35-.1-.42-.29l-.13-.43a3.32 3.32 0 0 1-.76.59 2.24 2.24 0 0 1-1 .22c-.3 0-.57-.07-.82-.2a1.89 1.89 0 0 1-.65-.57 2.92 2.92 0 0 1-.43-.91 4.54 4.54 0 0 1 .02-2.41c.12-.36.28-.68.5-.94a2.18 2.18 0 0 1 1.76-.85c.29 0 .53.04.73.13.2.08.39.2.55.34V3h1.7zM12.98 11.2V6.69l-.37-.08a.8.8 0 0 1-.31-.14c-.08-.06-.12-.15-.12-.27v-.67h.8v-.32c0-.33.05-.62.15-.88a1.91 1.91 0 0 1 1.17-1.11 2.78 2.78 0 0 1 1.7-.05l-.03.83a.3.3 0 0 1-.05.14.32.32 0 0 1-.1.1.63.63 0 0 1-.27.07c-.15 0-.29 0-.4.04a.64.64 0 0 0-.3.16.7.7 0 0 0-.17.3c-.04.11-.06.27-.06.45v.27h1.33v1.16h-1.28v4.5h-1.7z"/></svg>
     <!-- Local File -->
     <svg id="icon_local_file" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M7 0c.6 0 1 .4 1 1v4c0 .6.4 1 1 1h4c.6 0 1 .4 1 1v7a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V2c0-1.1.9-2 2-2h3zm6 4c.4.4.1 1-.4 1H10a1 1 0 0 1-1-1V1.4c0-.5.6-.8 1-.4l3 3zM5 8h6v1H5V8zm0 2h6v1H5v-1zm4 2H5v1h4v-1z"/></svg>
+    <!-- Prefereces -->
+    <svg id="icon_pref" xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M15 7h-2.1a4.97 4.97 0 0 0-.73-1.75l1.49-1.5a1 1 0 0 0-1.42-1.4l-1.49 1.48A4.97 4.97 0 0 0 9 3.1V1a1 1 0 0 0-2 0v2.1a4.97 4.97 0 0 0-1.75.73l-1.5-1.49a1 1 0 0 0-1.4 1.42l1.48 1.49A4.97 4.97 0 0 0 3.1 7H1a1 1 0 0 0 0 2h2.1a4.97 4.97 0 0 0 .74 1.76l-.05.03-1.45 1.45a1 1 0 1 0 1.42 1.42L5.2 12.2c0-.02.01-.03.03-.05A4.97 4.97 0 0 0 7 12.9V15a1 1 0 0 0 2 0v-2.1a4.97 4.97 0 0 0 1.75-.73l1.5 1.49a1 1 0 0 0 1.4-1.42l-1.48-1.49A4.97 4.97 0 0 0 12.9 9H15a1 1 0 0 0 0-2zM5 8a3 3 0 1 1 3 3 3 3 0 0 1-3-3z"/></svg>
+    <!-- Addons -->
+    <svg id="icon_addons" xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M14.5 8c-.97 0-1 1-1.75 1a.77.77 0 0 1-.75-.75V5a1 1 0 0 0-1-1H7.75A.77.77 0 0 1 7 3.25c0-.75 1-.78 1-1.75C8 .64 7.1 0 6 0S4 .64 4 1.5c0 .97 1 1 1 1.75a.77.77 0 0 1-.75.75H1a1 1 0 0 0-1 1v2.25A.77.77 0 0 0 .75 8c.75 0 .78-1 1.75-1C3.37 7 4 7.9 4 9s-.64 2-1.5 2c-.97 0-1-1-1.75-1a.77.77 0 0 0-.75.75V15a1 1 0 0 0 1 1h3.25a.77.77 0 0 0 .75-.75c0-.75-1-.78-1-1.75 0-.86.9-1.5 2-1.5s2 .64 2 1.5c0 .97-1 1-1 1.75a.77.77 0 0 0 .75.75H11a1 1 0 0 0 1-1v-3.25a.77.77 0 0 1 .75-.75c.75 0 .78 1 1.75 1 .86 0 1.5-.9 1.5-2s-.64-2-1.5-2z"/></svg>
+    <!-- Performance -->
+    <svg id="icon_perf" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path d="M8 1a8 8 0 0 0-8 8 7.89 7.89 0 0 0 .78 3.43 1 1 0 0 0 .9.57.94.94 0 0 0 .43-.1 1 1 0 0 0 .47-1.33A6.07 6.07 0 0 1 2 9a6 6 0 0 1 12 0 5.93 5.93 0 0 1-.59 2.57 1 1 0 0 0 1.81.86A7.89 7.89 0 0 0 16 9a8 8 0 0 0-8-8z"/><path d="M11.77 7.08a.5.5 0 0 0-.69.15L8.62 11.1A2.12 2.12 0 0 0 8 11a2 2 0 0 0 0 4 2.05 2.05 0 0 0 1.12-.34 2.31 2.31 0 0 0 .54-.54 2 2 0 0 0 0-2.24 2.31 2.31 0 0 0-.2-.24l2.46-3.87a.5.5 0 0 0-.15-.69z"/></svg>
     <!-- Firefox -->
     <svg id="icon_ff" xmlns="http://www.w3.org/2000/svg" viewBox="-5 0 310 310"><path d="M135 308.49c-34.95-4.8-65.73-20.74-91-47.13-23.74-24.8-37.32-55.75-39.67-90.44l-.7-10.42L1.8 166l-1.83 5.5.55-7c1.06-13.75 5.04-33.94 7.63-38.79 2.08-3.87 0-2.62-2.49 1.5-3.59 5.96-3.29 3.39.95-8 4.43-11.92 10.13-23.07 15.22-29.77C25.21 85 25.76 83.5 26.36 77c1.2-12.88 6.06-27.4 10.72-32.07 1-1 2.47-3.08 3.26-4.62.8-1.54 2.31-3.58 3.36-4.53 1.84-1.67 1.94-1.51 3.09 5.19.94 5.5 2.11 8.23 5.76 13.45 2.52 3.6 5.11 6.9 5.76 7.32.66.42 5.91.81 11.69.86 6.39.06 13.12.77 17.2 1.82l6.7 1.73 5.44-4.02c3-2.22 8.09-5 11.3-6.19 9.92-3.66 24.36-4.76 24.36-1.85 0 .5-.49.92-1.09.92-.6 0-2.7 1.46-4.7 3.25-11.25 10.12-16.5 18.16-15.59 23.83 1.23 7.57 5.93 10.48 19.92 12.32 16 2.11 16.98 2.63 16.47 8.6-.6 7.05-4.6 10.59-20.95 18.54-7.39 3.6-13.09 6.97-13 7.69.61 4.57-.25 13.82-1.39 14.96-.73.73-1.14 1.89-.92 2.57.5 1.48-1.37 1.67-2.26.23-.94-1.53-8.49-5.17-8.49-4.1 0 .5-.8.71-1.77.46-4.55-1.19-9.02 8.88-7.12 16.02 1.73 6.5 14.3 18.18 23.2 21.56 4.68 1.78 12.61 1.22 21.6-1.53 14.6-4.45 25.54-2.65 34.24 5.63 2.77 2.64 3.85 4.49 3.85 6.62 0 4.26-1.66 5.35-8.15 5.35-5 0-7.05.68-15.55 5.16-5.39 2.83-12.05 5.75-14.8 6.48-6.61 1.77-22.63 1.7-29.45-.12-3-.8-5.63-1.28-5.83-1.07-2 2 12.09 14.67 21.06 18.93 14.18 6.73 32.87 8.55 48 4.68 8.74-2.24 11.56-3.55 21.22-9.92 24.84-16.35 35.73-45.8 27.98-75.64-3.16-12.18-6.83-18.19-17.47-28.58-24.36-23.82-31.9-48.55-23.57-77.18 2.86-9.8 9.47-23.02 16.33-32.65l4.56-6.41 2.28 5.16c3.04 6.88 9.37 14.96 21.48 27.4l10 10.26 2.4-5.9c1.33-3.24 2.83-6.32 3.35-6.84.58-.58 1.86 1.08 3.38 4.4 1.34 2.94 5.06 9.39 8.27 14.34 24.96 38.59 36.18 62.69 39.69 85.33l1.29 8.33 2.27-2.64c2.07-2.42 2.34-2.49 3.02-.83 1.46 3.57.67 32.44-1.1 40.31a133.86 133.86 0 0 1-11.74 32.55c-3.87 7.54-4.92 10.6-4.92 14.36 0 17.23-16.25 36.56-41.5 49.37-5.08 2.58-8.1 4.95-11 8.66-14.88 19.03-54.25 28.94-93.5 23.55z"/></svg>
     <!-- Pin -->

From ca29d3c0114c240399279490e49d6ee3d2c643c5 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Thu, 28 Mar 2019 15:56:05 +0500
Subject: [PATCH 16/22] Cleanup scroll-box

---
 src/sidebar/components/scroll-box.vue | 74 +--------------------------
 1 file changed, 1 insertion(+), 73 deletions(-)

diff --git a/src/sidebar/components/scroll-box.vue b/src/sidebar/components/scroll-box.vue
index e5ac117f..71425237 100644
--- a/src/sidebar/components/scroll-box.vue
+++ b/src/sidebar/components/scroll-box.vue
@@ -1,10 +1,5 @@
 <template lang="pug">
-.ScrollBox(
-  @mousedown="onMouseDown"
-  @mousemove="onMouseMove"
-  @mouseup="onMouseUp"
-  @mouseleave="onMouseUp"
-  @wheel="onWheel")
+.ScrollBox(@wheel="onWheel")
   .progress(ref="scroll", :data-scrolling="scrolling")
   .top-shadow(:data-show="topOverflow")
   .bottom-shadow(:data-show="bottomOverflow")
@@ -25,8 +20,6 @@ import Debounce from '../../directives/debounce'
 
 Vue.directive('debounce', Debounce)
 
-const DRAG_SCROLL_AREA = 38
-
 export default {
   props: {
     lock: Boolean,
@@ -37,7 +30,6 @@ export default {
       topOverflow: false,
       bottomOverflow: false,
       scrollGripY: 0,
-      scrollGripHeight: 0,
       scrolling: false,
       scrollY: 0,
       boxHeight: 0,
@@ -45,11 +37,6 @@ export default {
     }
   },
 
-  created() {
-    this.mpb = []
-    this.autoScrollRatio = 1
-  },
-
   mounted() {
     this.topOffset = this.$el.getBoundingClientRect().top
     this.$nextTick(() => this.recalcScroll())
@@ -59,69 +46,10 @@ export default {
   },
 
   methods: {
-    onMouseDown(e) {
-      this.mpb[e.button] = true
-    },
-
-    onMouseUp(e) {
-      this.mpb[e.button] = false
-      this.autoScroll()
-    },
-
-    onMouseMove(e) {
-      if (!this.mpb[0] && !this.mpb[2]) return
-      let boxHeight = this.$refs.scrollBox.offsetHeight
-      let contentHeight = this.$refs.scrollContent.offsetHeight
-      if (contentHeight <= boxHeight) return
-
-      if (e.clientY - this.topOffset < DRAG_SCROLL_AREA) {
-        this.autoScrollRatio = (e.clientY - this.topOffset - DRAG_SCROLL_AREA) >> 2
-        this.autoScrollRatio = Math.abs(this.autoScrollRatio)
-        this.autoScroll(-1, e)
-        return
-      }
-
-      if (boxHeight - e.clientY + this.topOffset < DRAG_SCROLL_AREA) {
-        this.autoScrollRatio = (boxHeight - e.clientY + this.topOffset - DRAG_SCROLL_AREA) >> 2
-        this.autoScrollRatio = Math.abs(this.autoScrollRatio)
-        this.autoScroll(1, e)
-        return
-      }
-
-      this.autoScroll()
-    },
-
     onWheel(e) {
       if (this.lock) e.preventDefault()
     },
 
-    autoScroll(y, e) {
-      if (y && !this.autoScrolling) {
-        this.autoScrolling = true
-        this.autoScrollLoop(y, e)
-      }
-
-      if (!y) {
-        if (this.autoScrolling) this.autoScrolling = false
-      }
-    },
-
-    autoScrollLoop(y, e) {
-      if (!this.autoScrolling) return
-      let contentY = this.$refs.scrollBox.scrollTop
-      let boxHeight = this.$refs.scrollBox.offsetHeight
-      let contentHeight = this.$refs.scrollContent.offsetHeight
-      if (y < 0 && contentY > 0) {
-        this.$refs.scrollBox.scrollTop = contentY - 1 * this.autoScrollRatio
-        this.$emit('auto-scroll', e)
-      }
-      if (y > 0 && contentY + boxHeight < contentHeight) {
-        this.$refs.scrollBox.scrollTop = contentY + 1 * this.autoScrollRatio
-        this.$emit('auto-scroll', e)
-      }
-      window.requestAnimationFrame(() => this.autoScrollLoop(y, e))
-    },
-
     recalcScroll() {
       if (!this.$refs.scrollBox) return
       let boxHeight = this.$refs.scrollBox.offsetHeight

From 6c54b10f782f3fdf08afa5d37282410100b95fa3 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Thu, 28 Mar 2019 15:56:42 +0500
Subject: [PATCH 17/22] Fixed: Handle changes of container with multiple
 windows opened

---
 src/sidebar/actions/panels.js    | 10 +++-----
 src/sidebar/actions/sync.js      |  1 +
 src/sidebar/components/index.vue | 39 +++++++++++++++++---------------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/sidebar/actions/panels.js b/src/sidebar/actions/panels.js
index 47998db9..20cdba31 100644
--- a/src/sidebar/actions/panels.js
+++ b/src/sidebar/actions/panels.js
@@ -82,19 +82,13 @@ export default {
   /**
    * Update containers data
    */
-  async updateContainers({ state }, containers) {
+  async updateContainers({ state, dispatch }, containers) {
     if (!containers) return
 
     for (let localCtr of state.containers) {
       const newCtr = containers.find(nc => nc.id === localCtr.id)
       if (!newCtr) continue
 
-      localCtr.colorCode = newCtr.colorCode
-      localCtr.color = newCtr.color
-      localCtr.icon = newCtr.icon
-      localCtr.iconUrl = newCtr.iconUrl
-      localCtr.name = newCtr.name
-
       localCtr.lockedTabs = newCtr.lockedTabs
       localCtr.lockedPanel = newCtr.lockedPanel
       localCtr.proxy = newCtr.proxy
@@ -107,6 +101,8 @@ export default {
       localCtr.excludeHosts = newCtr.excludeHosts
       localCtr.lastActiveTab = newCtr.lastActiveTab
     }
+
+    dispatch('updateReqHandlerDebounced')
   },
 
   /**
diff --git a/src/sidebar/actions/sync.js b/src/sidebar/actions/sync.js
index 14fb2bcf..23152c59 100644
--- a/src/sidebar/actions/sync.js
+++ b/src/sidebar/actions/sync.js
@@ -110,6 +110,7 @@ export default {
    * ReSync panels from last loaded state.
    */
   resyncPanels({ state, dispatch }) {
+    if (!state.windowFocused) return
     if (state.lastSyncPanels) dispatch('updateSyncPanels', state.lastSyncPanels)
   },
 
diff --git a/src/sidebar/components/index.vue b/src/sidebar/components/index.vue
index 1678ac8d..10cbbdd6 100644
--- a/src/sidebar/components/index.vue
+++ b/src/sidebar/components/index.vue
@@ -1131,8 +1131,6 @@ export default {
      * contextualIdentities.onCreated
      */
     onCreatedContainer({ contextualIdentity }) {
-      if (!State.windowFocused) return
-
       State.ctxs.push(contextualIdentity)
       State.containers.push({
         ...contextualIdentity,
@@ -1152,23 +1150,24 @@ export default {
         excludeHosts: '',
         lastActiveTab: -1,
       })
-      State.panelIndex = this.panels.length - 1
-      State.lastPanelIndex = State.panelIndex
-
-      this.openDashboard(State.panelIndex)
 
       // Check if we have some updates
       // for container with this name
-      Store.dispatch('resyncPanels')
-      Store.dispatch('saveContainers')
+      if (State.windowFocused) {
+        State.panelIndex = this.panels.length - 1
+        State.lastPanelIndex = State.panelIndex
+
+        this.openDashboard(State.panelIndex)
+
+        Store.dispatch('resyncPanels')
+        Store.dispatch('saveContainers')
+      }
     },
 
     /**
      * contextualIdentities.onRemoved
      */
     async onRemovedContainer({ contextualIdentity }) {
-      if (!State.windowFocused) return
-
       let id = contextualIdentity.cookieStoreId
 
       // Find container
@@ -1187,19 +1186,21 @@ export default {
       State.containers.splice(ctrIndex, 1)
 
       // Switch to prev panel
-      State.panelIndex = this.panels.length - 1
-      State.lastPanelIndex = State.panelIndex
+      if (State.panelIndex >= this.panels.length) {
+        State.panelIndex = this.panels.length - 1
+        State.lastPanelIndex = State.panelIndex
+      }
 
-      Store.dispatch('updateReqHandler')
-      Store.dispatch('saveContainers')
+      if (State.windowFocused) {
+        Store.dispatch('updateReqHandler')
+        Store.dispatch('saveContainers')
+      }
     },
 
     /**
      * contextualIdentities.onUpdated
      */
     onUpdatedContainer({ contextualIdentity }) {
-      if (!State.windowFocused) return
-
       let id = contextualIdentity.cookieStoreId
       let ctxIndex = State.ctxs.findIndex(c => c.cookieStoreId === id)
       let ctrIndex = State.containers.findIndex(c => c.cookieStoreId === id)
@@ -1212,8 +1213,10 @@ export default {
       State.containers[ctrIndex].iconUrl = contextualIdentity.iconUrl
       State.containers[ctrIndex].name = contextualIdentity.name
 
-      Store.dispatch('saveSyncPanels')
-      Store.dispatch('saveContainers')
+      if (State.windowFocused) {
+        Store.dispatch('saveSyncPanels')
+        Store.dispatch('saveContainers')
+      }
     },
     // ---
 

From dfeeedceb21b73b4da732ae9337793fa9f8c321d Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Thu, 28 Mar 2019 17:07:38 +0500
Subject: [PATCH 18/22] Refactoring

---
 src/sidebar/actions/tabs.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/sidebar/actions/tabs.js b/src/sidebar/actions/tabs.js
index 1581073b..c8735536 100644
--- a/src/sidebar/actions/tabs.js
+++ b/src/sidebar/actions/tabs.js
@@ -60,14 +60,14 @@ export default {
         let offset = 0
         for (let i = 0; i < ans.tabsTreeState.length; i++) {
           // Saved nodes
-          const t = ans.tabsTreeState[i]
+          const savedTab = ans.tabsTreeState[i]
 
           // Current tab
-          let tab = state.tabs[t.index - offset]
+          let tab = state.tabs[savedTab.index - offset]
           if (!tab) break
 
-          const sameUrl = t.url === tab.url
-          const isGroup = Utils.IsGroupUrl(t.url)
+          const sameUrl = savedTab.url === tab.url
+          const isGroup = Utils.IsGroupUrl(savedTab.url)
           if (isGroup) {
             let nextUrlOk = true
 
@@ -81,20 +81,20 @@ export default {
 
             // Removed group
             if (!sameUrl && nextUrlOk) {
-              const groupId = Utils.GetGroupId(t.url)
-              const parent = parents[t.parentId]
+              const groupId = Utils.GetGroupId(savedTab.url)
+              const parent = parents[savedTab.parentId]
               const rTab = await browser.tabs.create({
                 windowId: state.windowId,
-                index: t.index,
+                index: savedTab.index,
                 url: browser.runtime.getURL('group/group.html') + `#${groupId}`,
-                cookieStoreId: t.ctx,
+                cookieStoreId: savedTab.ctx,
                 active: false,
               })
 
               tab = state.tabsMap[rTab.id]
-              tab.isParent = t.isParent
-              tab.folded = t.folded
-              if (t.isParent) parents[t.id] = tab
+              tab.isParent = savedTab.isParent
+              tab.folded = savedTab.folded
+              if (savedTab.isParent) parents[savedTab.id] = tab
               if (parent) {
                 tab.invisible = parent.folded || parent.invisible
                 tab.parentId = parent.id
@@ -105,13 +105,13 @@ export default {
 
           // Check if this is actual target tab
           if (!sameUrl && tab.status === 'complete') break
-          if (tab.cookieStoreId !== t.ctx) break
+          if (tab.cookieStoreId !== savedTab.ctx) break
 
-          tab.isParent = t.isParent
-          tab.folded = t.folded
-          if (t.isParent) parents[t.id] = tab
-          if (parents[t.parentId]) {
-            const parentTab = parents[t.parentId]
+          tab.isParent = savedTab.isParent
+          tab.folded = savedTab.folded
+          if (savedTab.isParent) parents[savedTab.id] = tab
+          if (parents[savedTab.parentId]) {
+            const parentTab = parents[savedTab.parentId]
             tab.invisible = parentTab.folded || parentTab.invisible
             tab.parentId = parentTab.id
           }

From 2c81dd16e6ca2566af897fba00ed1c039b2f6246 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Thu, 28 Mar 2019 18:31:59 +0500
Subject: [PATCH 19/22] Fixed: Requesting of optional permissions

---
 src/permissions/main.js                       |  5 +++--
 src/sidebar/actions/tabs.js                   | 14 ++++----------
 .../dashboards/containered-tabs.vue           | 10 ++++------
 src/sidebar/components/panels/settings.vue    | 19 +++----------------
 src/sidebar/index.js                          |  1 +
 src/sidebar/store.actions.js                  |  8 ++++++++
 6 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/src/permissions/main.js b/src/permissions/main.js
index 9e0b5dab..dad3c7ef 100644
--- a/src/permissions/main.js
+++ b/src/permissions/main.js
@@ -1,5 +1,5 @@
 // Load settings and set theme
-void(async function() {
+void (async function() {
   let ans = await browser.storage.local.get('settings')
   let settings = ans.settings
   let theme = settings ? settings.theme : 'dark'
@@ -36,7 +36,8 @@ void (async function() {
 
   reqBtnEl.addEventListener('click', () => {
     browser.permissions.request({ origins, permissions }).then(() => {
-      browser.runtime.reload()
+      browser.runtime.sendMessage({ action: 'reloadOptPermissions' })
+      browser.tabs.getCurrent().then(tab => browser.tabs.remove([tab.id]))
     })
   })
 })()
diff --git a/src/sidebar/actions/tabs.js b/src/sidebar/actions/tabs.js
index c8735536..ac4824bb 100644
--- a/src/sidebar/actions/tabs.js
+++ b/src/sidebar/actions/tabs.js
@@ -463,14 +463,9 @@ export default {
    * Clear all cookies of tab urls
    */
   async clearTabsCookies({ state }, tabIds) {
-    try {
-      const permitted = await browser.permissions.contains({ origins: ['<all_urls>'] })
-      if (!permitted) {
-        const url = browser.runtime.getURL('permissions/all-urls.html')
-        browser.tabs.create({ url })
-        return
-      }
-    } catch (err) {
+    if (!state.permAllUrls) {
+      const url = browser.runtime.getURL('permissions/all-urls.html')
+      browser.tabs.create({ url })
       return
     }
 
@@ -891,8 +886,7 @@ export default {
    */
   async groupTabs({ state, dispatch }, tabIds) {
     // Check permissions
-    const permitted = await browser.permissions.contains({ origins: ['<all_urls>'] })
-    if (!permitted) {
+    if (!state.permAllUrls) {
       const url = browser.runtime.getURL('permissions/all-urls.html')
       browser.tabs.create({ url })
       return
diff --git a/src/sidebar/components/dashboards/containered-tabs.vue b/src/sidebar/components/dashboards/containered-tabs.vue
index eb53e411..883231fe 100644
--- a/src/sidebar/components/dashboards/containered-tabs.vue
+++ b/src/sidebar/components/dashboards/containered-tabs.vue
@@ -161,6 +161,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import Store from '../../store'
+import State from '../../store.state'
 import TextInput from '../inputs/text'
 import ScrollBox from '../scroll-box'
 import ToggleField from '../fields/toggle'
@@ -447,8 +448,7 @@ export default {
 
     async toggleIncludeHosts() {
       if (!this.conf.includeHostsActive) {
-        const permitted = await browser.permissions.contains({ origins: ['<all_urls>'] })
-        if (!permitted) {
+        if (!State.permAllUrls) {
           const permUrl = browser.runtime.getURL('permissions/all-urls.html')
           this.$emit('close')
           this.switchProxy('direct')
@@ -477,8 +477,7 @@ export default {
 
     async toggleExcludeHosts() {
       if (!this.conf.excludeHostsActive) {
-        const permitted = await browser.permissions.contains({ origins: ['<all_urls>'] })
-        if (!permitted) {
+        if (!State.permAllUrls) {
           const permUrl = browser.runtime.getURL('permissions/all-urls.html')
           this.$emit('close')
           this.switchProxy('direct')
@@ -508,8 +507,7 @@ export default {
     async switchProxy(type) {
       // Check permissions
       if (type !== 'direct') {
-        const permitted = await browser.permissions.contains({ origins: ['<all_urls>'] })
-        if (!permitted) {
+        if (!State.permAllUrls) {
           this.$emit('close')
           this.switchProxy('direct')
           browser.tabs.create({
diff --git a/src/sidebar/components/panels/settings.vue b/src/sidebar/components/panels/settings.vue
index 616aa714..b08e5470 100644
--- a/src/sidebar/components/panels/settings.vue
+++ b/src/sidebar/components/panels/settings.vue
@@ -368,13 +368,6 @@ export default {
     },
   },
 
-  async mounted() {
-    // Get permissions state
-    State.permAllUrls = await browser.permissions.contains({ origins: ['<all_urls>'] })
-    State.permTabHide = await browser.permissions.contains({ permissions: ['tabHide'] })
-    if (State.hideInact) Store.dispatch('hideInactPanelsTabs')
-  },
-
   methods: {
     switchOpt(e, optName) {
       const opt = State[optName]
@@ -403,8 +396,7 @@ export default {
     },
 
     // --- Tabs ---
-    async toggleHideInact() {
-      State.permTabHide = await browser.permissions.contains({ permissions: ['tabHide'] })
+    toggleHideInact() {
       if (State.hideInact) {
         Store.dispatch('showAllTabs')
       } else {
@@ -450,8 +442,7 @@ export default {
       Store.dispatch('saveTabsTree')
     },
 
-    async toggleHideFoldedTabs() {
-      State.permTabHide = await browser.permissions.contains({ permissions: ['tabHide'] })
+    toggleHideFoldedTabs() {
       if (State.hideFoldedTabs) {
         const toShow = State.tabs.filter(t => t.invisible).map(t => t.id)
         browser.tabs.show(toShow)
@@ -599,8 +590,6 @@ export default {
 
     // --- Permissions ---
     async togglePermAllUrls() {
-      State.permAllUrls = await browser.permissions.contains({ origins: ['<all_urls>'] })
-
       if (State.permAllUrls) {
         await browser.permissions.remove({ origins: ['<all_urls>'] })
         State.proxiedPanels = {}
@@ -610,7 +599,7 @@ export default {
           if (c.includeHostsActive) c.includeHostsActive = false
           if (c.excludeHostsActive) c.excludeHostsActive = false
         })
-        State.permAllUrls = await browser.permissions.contains({ origins: ['<all_urls>'] })
+        State.permAllUrls = false
       } else {
         browser.tabs.create({
           url: browser.runtime.getURL('permissions/all-urls.html'),
@@ -621,8 +610,6 @@ export default {
     },
 
     async togglePermTabHide() {
-      State.permTabHide = await browser.permissions.contains({ permissions: ['tabHide'] })
-
       if (State.permTabHide) {
         await Store.dispatch('showAllTabs')
         await browser.permissions.remove({ permissions: ['tabHide'] })
diff --git a/src/sidebar/index.js b/src/sidebar/index.js
index 5f1e6384..f05ddec3 100644
--- a/src/sidebar/index.js
+++ b/src/sidebar/index.js
@@ -133,6 +133,7 @@ export default new Vue({
 
       if (changes.settings) {
         Store.dispatch('updateSettings', changes.settings.newValue)
+        Store.dispatch('reloadOptPermissions')
       }
       if (changes.styles) Store.dispatch('applyStyles', changes.styles.newValue)
       if (changes.containers) {
diff --git a/src/sidebar/store.actions.js b/src/sidebar/store.actions.js
index e727350b..c73e6d11 100644
--- a/src/sidebar/store.actions.js
+++ b/src/sidebar/store.actions.js
@@ -78,6 +78,14 @@ export default {
     if (state.hideInact) dispatch('hideInactPanelsTabs')
   },
 
+  /**
+   * Reload optianal permissions
+   */
+  async reloadOptPermissions({ state, dispatch }) {
+    state.permAllUrls = await browser.permissions.contains({ origins: ['<all_urls>'] })
+    state.permTabHide = await browser.permissions.contains({ permissions: ['tabHide'] })
+    if (state.hideInact) dispatch('hideInactPanelsTabs')
+  },
 
   /**
    * Get all windows and check which current

From ddf69dcef6fe8827f5d23bc7e609b6e5983d75d3 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Thu, 28 Mar 2019 18:41:08 +0500
Subject: [PATCH 20/22] Cleanup

---
 src/sidebar/components/panels/tabs.tab.vue | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/sidebar/components/panels/tabs.tab.vue b/src/sidebar/components/panels/tabs.tab.vue
index c9244fd4..52c397e9 100644
--- a/src/sidebar/components/panels/tabs.tab.vue
+++ b/src/sidebar/components/panels/tabs.tab.vue
@@ -30,7 +30,7 @@
     svg.-mute: use(xlink:href="#icon_mute")
   .fav(:loading="loading")
     .placeholder: svg: use(:xlink:href="favPlaceholder")
-    img(:src="favicon", @load.passive="onFaviconLoad", @error="onFaviconErr")
+    img(:src="favicon", @load.passive="onFaviconLoad")
     .exp(@dblclick.prevent.stop="", @mousedown.stop="onExp"): svg: use(xlink:href="#icon_expand")
     .update-badge
     .ok-badge
@@ -75,7 +75,6 @@ export default {
   data() {
     return {
       menu: false,
-      faviErr: false,
       loading: false,
       selected: false,
     }
@@ -91,11 +90,6 @@ export default {
       else return State.favicons[this.tab.host] || this.tab.favIconUrl
     },
 
-    offsetStyle() {
-      if (!this.offsetY) return {}
-      return { transform: `translateY(${this.offsetY}px)` }
-    },
-
     tooltip() {
       return `${this.tab.title}\n${decodeURI(this.tab.url)}`
     },
@@ -369,10 +363,6 @@ export default {
       }
     },
 
-    onFaviconErr() {
-      this.faviErr = true
-    },
-
     /**
      * Handle mousedown event on expand button
      */

From 0e6dad525fa5b60c3c17c7122880de276ef0ca23 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Thu, 28 Mar 2019 19:57:27 +0500
Subject: [PATCH 21/22] Tests

---
 src/sidebar/actions/sync.test.js | 3 ++-
 src/sidebar/actions/tabs.test.js | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/sidebar/actions/sync.test.js b/src/sidebar/actions/sync.test.js
index e8503b1f..d919bc16 100644
--- a/src/sidebar/actions/sync.test.js
+++ b/src/sidebar/actions/sync.test.js
@@ -204,7 +204,8 @@ describe('loadSyncPanels', () => {
 describe('resyncPanels', () => {
   test('resync panels', async () => {
     const state = {
-      lastSyncPanels: '123456789'
+      windowFocused: true,
+      lastSyncPanels: '123456789',
     }
     const dispatch = jest.fn()
 
diff --git a/src/sidebar/actions/tabs.test.js b/src/sidebar/actions/tabs.test.js
index af01a9f3..138a912d 100644
--- a/src/sidebar/actions/tabs.test.js
+++ b/src/sidebar/actions/tabs.test.js
@@ -575,6 +575,7 @@ describe('bookmarkTabs', () => {
 describe('clearTabsCookies', () => {
   test('clear cookies', async () => {
     const state = {
+      permAllUrls: true,
       tabs: [
         { id: 1 },
         { id: 2, title: 'a', url: 'http://some.com' },

From 79ad1b967f05754eff526cdaec2d4751257866d8 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Thu, 28 Mar 2019 19:57:58 +0500
Subject: [PATCH 22/22] Bump version

---
 addon/manifest.json | 2 +-
 package.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/manifest.json b/addon/manifest.json
index 2c1246e0..0d76f654 100644
--- a/addon/manifest.json
+++ b/addon/manifest.json
@@ -8,7 +8,7 @@
   },
   "author": "mbnuqw",
   "name": "__MSG_ExtName__",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "default_locale": "en",
   "description": "__MSG_ExtDesc__",
   "homepage_url": "https://github.com/mbnuqw/sidebery",
diff --git a/package.json b/package.json
index 15a3cef4..bccd761a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sidebery",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "Manage your tabs and bookmarks in sidebar",
   "main": "index.js",
   "scripts": {