GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 22:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Fix Esc not closing TS pages (#2240)

Browse source
This commit is contained in:
Abdo 2022-12-06 13:03:34 +03:00 committed by GitHub
parent 613b5c1034
commit f0c3256e39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
qt/aqt/data/web/js/webview.ts
View file

@ -1,11 +1,9 @@
/* Copyright: Ankitects Pty Ltd and contributors /* Copyright: Ankitects Pty Ltd and contributors
* License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */
// prevent backspace key from going back a page
document.addEventListener("keydown", function(evt: KeyboardEvent) { document.addEventListener("keydown", function(evt: KeyboardEvent) {
if (evt.keyCode === 27) { if (evt.keyCode !== 8) {
pycmd("close");
} // prevent backspace key from going back a page
else if (evt.keyCode !== 8) {
return; return;
} }
let isText = 0; let isText = 0;

13
qt/aqt/webview.py
View file

@ -249,6 +249,19 @@ class AnkiWebView(QWebEngineView):
self._filterSet = False self._filterSet = False
gui_hooks.theme_did_change.append(self.on_theme_did_change) gui_hooks.theme_did_change.append(self.on_theme_did_change)
qconnect(self.loadFinished, self._on_load_finished)
def _on_load_finished(self) -> None:
self.eval(
"""
document.addEventListener("keydown", function(evt) {
if (evt.keyCode === 27) {
pycmd("close");
}
});
"""
)
def set_title(self, title: str) -> None: def set_title(self, title: str) -> None:
self.title = title # type: ignore[assignment] self.title = title # type: ignore[assignment]