mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

prevent incorrect jumpback (#3204)

Browse source 
Fixes: #3152
This commit is contained in:
abaevbog 2023-07-14 02:29:43 -07:00 • committed by GitHub
parent d7449b4d78
commit 0cd94555d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
chrome/content/zotero/tabs.js
View file

@ -181,7 +181,7 @@ var Zotero_Tabs = new function () {
* @param {Function} onClose
* @return {{ id: string, container: XULElement}} id - tab id, container - a new tab container created in the deck
*/
this.add = function ({ id, type, data, title, index, select, onClose }) {
this.add = function ({ id, type, data, title, index, select, onClose, preventJumpback }) {
if (typeof type != 'string') {
}
if (typeof title != 'string') {
@ -205,7 +205,9 @@ var Zotero_Tabs = new function () {
if (select) {
let previousID = this._selectedID;
this.select(id);
this._prevSelectedID = previousID;
if (!preventJumpback) {
this._prevSelectedID = previousID;
}
}
return { id, container };
};
@ -368,7 +370,8 @@ var Zotero_Tabs = new function () {
title: tab.title,
tabIndex,
allowDuplicate: true,
secondViewState: tab.data.secondViewState
secondViewState: tab.data.secondViewState,
preventJumpback: true
});
return;
}

10
chrome/content/zotero/xpcom/reader.js
View file

@ -1287,7 +1287,7 @@ class ReaderInstance {
}
class ReaderTab extends ReaderInstance {
constructor({ itemID, title, sidebarWidth, sidebarOpen, bottomPlaceholderHeight, index, tabID, background }) {
constructor({ itemID, title, sidebarWidth, sidebarOpen, bottomPlaceholderHeight, index, tabID, background, preventJumpback }) {
super();
this._itemID = itemID;
this._sidebarWidth = sidebarWidth;
@ -1303,7 +1303,8 @@ class ReaderTab extends ReaderInstance {
data: {
itemID
},
select: !background
select: !background,
preventJumpback: preventJumpback
});
this.tabID = id;
this._tabContainer = container;
@ -1647,7 +1648,7 @@ class Reader {
await this.open(item.id, location, options);
}
async open(itemID, location, { title, tabIndex, tabID, openInBackground, openInWindow, allowDuplicate, secondViewState } = {}) {
async open(itemID, location, { title, tabIndex, tabID, openInBackground, openInWindow, allowDuplicate, secondViewState, preventJumpback } = {}) {
this._loadSidebarState();
this.triggerAnnotationsImportCheck(itemID);
let reader;
@ -1706,7 +1707,8 @@ class Reader {
background: openInBackground,
sidebarWidth: this._sidebarWidth,
sidebarOpen: this._sidebarOpen,
bottomPlaceholderHeight: this._bottomPlaceholderHeight
bottomPlaceholderHeight: this._bottomPlaceholderHeight,
preventJumpback: preventJumpback
});
this._readers.push(reader);
if (!(await reader.open({ itemID, location, secondViewState }))) {