Merge branch 'dev'

mbnuqw · Dec 31, 2019 · e987e50 · e987e50
2 parents ca4788a + 0d79edf
commit e987e50
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/addon/manifest.json b/addon/manifest.json
@@ -8,7 +8,7 @@
   },
   "author": "mbnuqw",
   "name": "__MSG_ExtName__",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "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": "4.0.2",
+  "version": "4.0.3",
   "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
@@ -739,7 +739,7 @@ function activateLastActiveTabOf(panelIndex) {
   if (!p || !p.tabs || !p.tabs.length) return
 
   let tab = this.state.tabsMap[p.lastActiveTab]
-  if (!tab || tab.panelId !== p.id) tab = p.tabs[p.tabs.length - 1]
+  if (!tab || tab.panelId !== p.id) tab = p.tabs[0]
   if (tab) browser.tabs.update(tab.id, { active: true })
 }
 

diff --git a/src/sidebar/handlers/tabs.js b/src/sidebar/handlers/tabs.js
@@ -47,7 +47,7 @@ function onTabCreated(tab) {
       tab.openerTabId = this.actions.getParentForNewTab(panel, tab)
     }
     if (index === undefined) {
-      if (panel.moveTabCtx !== 'none') {
+      if (panel.moveTabCtx !== 'none' && tab.openerTabId === undefined) {
         index = panel.tabs.length ? panel.endIndex + 1 : panel.endIndex
       } else {
         index = tab.index