From ecd6d7ce2c2b28963cd0e02d7a1806d356d768c4 Mon Sep 17 00:00:00 2001
From: Martynas Bagdonas <martbgd@gmail.com>
Date: Tue, 24 Aug 2021 13:11:25 +0300
Subject: [PATCH] Implement tab jumpback #1985

---
 chrome/content/zotero/tabs.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/chrome/content/zotero/tabs.js b/chrome/content/zotero/tabs.js
index 6ef495271a..9cea97bb86 100644
--- a/chrome/content/zotero/tabs.js
+++ b/chrome/content/zotero/tabs.js
@@ -50,6 +50,7 @@ var Zotero_Tabs = new function () {
 		title: ''
 	}];
 	this._selectedID = 'zotero-pane';
+	this._prevSelectedID = null;
 
 	this._getTab = function (id) {
 		var tabIndex = this._tabs.findIndex(tab => tab.id == id);
@@ -154,7 +155,9 @@ var Zotero_Tabs = new function () {
 		this._update();
 		Zotero.Notifier.trigger('add', 'tab', [id], { [id]: data }, true);
 		if (select) {
+			let previousID = this._selectedID;
 			this.select(id);
+			this._prevSelectedID = previousID;
 		}
 		return { id, container };
 	};
@@ -191,7 +194,7 @@ var Zotero_Tabs = new function () {
 			return;
 		}
 		if (tab.id == this._selectedID) {
-			this.select((this._tabs[tabIndex + 1] || this._tabs[tabIndex - 1]).id);
+			this.select(this._prevSelectedID || (this._tabs[tabIndex + 1] || this._tabs[tabIndex - 1]).id);
 		}
 		this._tabs.splice(tabIndex, 1);
 		document.getElementById(tab.id).remove();
@@ -241,9 +244,10 @@ var Zotero_Tabs = new function () {
 	 */
 	this.select = function (id) {
 		var { tab } = this._getTab(id);
-		if (!tab) {
+		if (!tab || tab.id === this._selectedID) {
 			return;
 		}
+		this._prevSelectedID = null;
 		this._selectedID = id;
 		this.deck.selectedIndex = Array.from(this.deck.children).findIndex(x => x.id == id);
 		this._update();