From 59caaf56ea13dc19a20b069d8c87c46c4474aa6b Mon Sep 17 00:00:00 2001 From: Martynas Bagdonas Date: Mon, 14 Mar 2022 17:25:28 +0200 Subject: [PATCH] Fix PDF reader keyboard navigation in RTL mode --- chrome/content/zotero/xpcom/reader.js | 1 + chrome/content/zotero/zoteroPane.js | 6 ++++-- note-editor | 2 +- pdf-reader | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/chrome/content/zotero/xpcom/reader.js b/chrome/content/zotero/xpcom/reader.js index aa68996d49..351475053a 100644 --- a/chrome/content/zotero/xpcom/reader.js +++ b/chrome/content/zotero/xpcom/reader.js @@ -82,6 +82,7 @@ class ReaderInstance { sidebarWidth: this._sidebarWidth, sidebarOpen: this._sidebarOpen, bottomPlaceholderHeight: this._bottomPlaceholderHeight, + rtl: Zotero.rtl, localizedStrings: { ...Zotero.Intl.getPrefixedStrings('general.'), ...Zotero.Intl.getPrefixedStrings('pdfReader.') diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js index 3e4b8d5e78..1d6ae02fda 100644 --- a/chrome/content/zotero/zoteroPane.js +++ b/chrome/content/zotero/zoteroPane.js @@ -519,12 +519,14 @@ var ZoteroPane = new function() let itemPaneToggle = document.getElementById('zotero-tb-toggle-item-pane'); let notesPaneToggle = document.getElementById('zotero-tb-toggle-notes-pane'); // Using ArrowDown and ArrowUp to be consistent with pdf-reader - if (event.key === 'ArrowRight' || event.key === 'ArrowDown') { + if (!Zotero.rtl && (event.key === 'ArrowRight' || event.key === 'ArrowDown') + || Zotero.rtl && (event.key === 'ArrowLeft' || event.key === 'ArrowUp')) { if (event.target === itemPaneToggle) { notesPaneToggle.focus(); } } - else if (event.key === 'ArrowLeft' || event.key === 'ArrowUp') { + else if (!Zotero.rtl && (event.key === 'ArrowLeft' || event.key === 'ArrowUp') + || Zotero.rtl && (event.key === 'ArrowRight' || event.key === 'ArrowDown')) { if (event.target === notesPaneToggle) { itemPaneToggle.focus(); } diff --git a/note-editor b/note-editor index a3f0ea4ac9..7690fdc9f7 160000 --- a/note-editor +++ b/note-editor @@ -1 +1 @@ -Subproject commit a3f0ea4ac9077235fa4197a51375516072496a72 +Subproject commit 7690fdc9f78d65353215d48a71a1bf6e31f8c47d diff --git a/pdf-reader b/pdf-reader index cc517ae53b..702fd99ca5 160000 --- a/pdf-reader +++ b/pdf-reader @@ -1 +1 @@ -Subproject commit cc517ae53bd849e7dc3a958b156552117d209e53 +Subproject commit 702fd99ca58801be27b25ee550331b9615f27184