Merge branch 'dev'

addon/actions/msg.js

@@ -34,7 +34,6 @@ function initMessaging() {
     // Setup message handling
     let info = JSON.parse(port.name)
     if (info.instanceType === 'sidebar') {
-      if (!this.windows[info.windowId]) return
       connectedSidebars[info.windowId] = port
       port.onMessage.addListener(onSidebarMsg)
 
@@ -71,31 +70,6 @@ function onFirstSidebarInit(handler) {
   firstSidebarInitHandlers.push(handler)
 }
 
-/**
- * Wait for connecting sidebery instance of
- * target window.
- */
-async function waitForSidebarConnect(winId, limit = 1000) {
-  let waitingId = String(Math.random())
-  let waiting = new Promise(res => {
-    if (connectedSidebars[winId]) return res(true)
-
-    connectPending.push({
-      id: waitingId,
-      winId,
-      resolve: res,
-    })
-
-    setTimeout(() => {
-      let index = connectPending.findIndex(w => w.id === waitingId)
-      if (index > -1) connectPending.splice(index, 1)
-      res(false)
-    }, limit)
-  })
-
-  return waiting
-}
-
 /**
  * Handle message from sidebar
  */
@@ -113,5 +87,4 @@ export default {
   initMessaging,
   onSidebarMsg,
   onFirstSidebarInit,
-  waitForSidebarConnect,
 }

addon/actions/tabs.js

@@ -216,42 +216,6 @@ async function updateTabsTree() {
   }
 }
 
-/**
- * Move provided tabs to window
- */
-async function moveTabsToWin(winId, tabs, fromPrivate, rmTabId) {
-  let sidebarIsOpen = await browser.sidebarAction.isOpen({ windowId: winId })
-  let isConnected = false
-
-  if (sidebarIsOpen) {
-    isConnected = await this.actions.waitForSidebarConnect(winId, 7000)
-    if (isConnected) {
-      await browser.runtime.sendMessage({
-        instanceType: 'sidebar',
-        windowId: winId,
-        action: 'moveTabsToThisWin',
-        args: [tabs, fromPrivate],
-      })
-    }
-  }
-
-  if (!isConnected) {
-    let win = this.windows[winId]
-    if (win.incognito === fromPrivate) {
-      for (let tab of tabs) {
-        await browser.tabs.move(tab.id, { windowId: winId, index: -1 })
-      }
-    } else {
-      for (let tab of tabs) {
-        await browser.tabs.create({ url: tab.url, windowId: winId })
-        browser.tabs.remove(tab.id)
-      }
-    }
-  }
-
-  if (rmTabId > -1) await browser.tabs.remove(rmTabId)
-}
-
 function setupTabsListeners() {
   browser.tabs.onCreated.addListener(this.actions.onTabCreated)
   browser.tabs.onRemoved.addListener(this.actions.onTabRemoved)
@@ -282,7 +246,6 @@ export default {
   updateTabsTree,
   backupTabsData,
   saveTabsData,
-  moveTabsToWin,
 
   setupTabsListeners,
 }

addon/background.js

@@ -13,14 +13,14 @@ void (async function main() {
   Actions.initGlobalMessaging()
   Actions.initMessaging()
 
-  // Load containers
-  Actions.setupContainersListeners()
-  await Actions.loadContainers()
-
   // Load windows
   state.windows = await Actions.getWindows()
   Actions.setupWindowsListeners()
 
+  // Load containers
+  Actions.setupContainersListeners()
+  await Actions.loadContainers()
+
   // Load settings
   let { settings } = await browser.storage.local.get({ settings: null })
   state.settings = settings ? settings : {}

addon/manifest.json

@@ -8,7 +8,7 @@
   },
   "author": "mbnuqw",
   "name": "__MSG_ExtName__",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "default_locale": "en",
   "description": "__MSG_ExtDesc__",
   "homepage_url": "https://github.com/mbnuqw/sidebery",

addon/utils.js

@@ -526,15 +526,14 @@ function findDataForTabs(tabs, data) {
 
       // Saved tab is a group and its missing
       if (isGroupUrl(tabData.url) && tabData.url !== tab.url) {
-        tabData.index = k + gOffset
         tabData.isMissedGroup = true
         k--
-        gOffset++
         continue
       }
 
       // Match
-      if (tabData.url === tab.url || (tab.active && tab.url === 'about:blank')) {
+      let blindspot = tab.status === 'loading' && tab.url === 'about:blank'
+      if (tabData.url === tab.url || blindspot) {
         tabData.index = k + gOffset
         equalityCounter++
       }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sidebery",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "Manage your tabs and bookmarks in sidebar",
   "main": "index.js",
   "scripts": {
@@ -91,6 +91,7 @@
       "./test/env-setup.js"
     ],
     "testMatch": [
+      "**/addon/**/__tests__/*.test.js",
       "**/src/**/__tests__/*.test.js"
     ]
   }

src/sidebar/actions/bookmarks.js

@@ -620,6 +620,15 @@ async function sortBookmarks(type, nodeIds) {
   }
 }
 
+function highlightBookmarks(url) {
+  if (!this.state.highlightOpenBookmarks || !this.state.bookmarksUrlMap) return
+  if (!this.state.bookmarksUrlMap[url]) return
+
+  for (let b of this.state.bookmarksUrlMap[url]) {
+    b.isOpen = true
+  }
+}
+
 export default {
   loadBookmarks,
   saveBookmarksTree,
@@ -634,4 +643,5 @@ export default {
   collapseAllBookmarks,
   updateBookmarksCounter,
   sortBookmarks,
+  highlightBookmarks,
 }

src/sidebar/actions/settings.js

@@ -96,12 +96,6 @@ function updateSettings(settings) {
           parentId: tab.parentId,
           folded: tab.folded,
         })
-        if (Utils.isGroupUrl(tab.url)) {
-          if (!this.state.groupTabs) this.state.groupTabs = {}
-          this.state.groupTabs[tab.id] = true
-        } else if (this.state.groupTabs[tab.id]) {
-          this.state.groupTabs[tab.id] = false
-        }
       }
       this.actions.saveGroups()
     }