From 64c7d405f5dca33d1b299cb11884a345e6cc651b Mon Sep 17 00:00:00 2001 From: Henrik Giesel Date: Tue, 13 Apr 2021 19:54:45 +0200 Subject: [PATCH 1/6] Remove jquery from browser.py --- qt/aqt/browser/browser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt/aqt/browser/browser.py b/qt/aqt/browser/browser.py index 7dc2db756..ac2cdeb5d 100644 --- a/qt/aqt/browser/browser.py +++ b/qt/aqt/browser/browser.py @@ -607,7 +607,7 @@ where id in %s""" def _on_preview_closed(self) -> None: if self.editor.web: - self.editor.web.eval("$('#previewButton').removeClass('highlighted')") + self.editor.web.eval("document.getElementById('previewButton').classList.remove('highlighted')") self._previewer = None # Card deletion From bdf1e6324ed71d44108ffbbff4eeabfbaab13771 Mon Sep 17 00:00:00 2001 From: Henrik Giesel Date: Tue, 13 Apr 2021 19:59:00 +0200 Subject: [PATCH 2/6] Remove jQuery from toolbar.py --- qt/aqt/toolbar.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/qt/aqt/toolbar.py b/qt/aqt/toolbar.py index a8bd20bce..c4e11dfc7 100644 --- a/qt/aqt/toolbar.py +++ b/qt/aqt/toolbar.py @@ -149,11 +149,8 @@ class Toolbar: """ def set_sync_active(self, active: bool) -> None: - if active: - meth = "addClass" - else: - meth = "removeClass" - self.web.eval(f"$('#sync-spinner').{meth}('spin')") + method = "add" if active else "remove" + self.web.eval(f"document.getElementById('sync-spinner').classList.{method}('spin')") def set_sync_status(self, status: SyncStatus) -> None: self.web.eval(f"updateSyncColor({status.required})") From 7dd12a523d368323b8f8dcf5ae22e615129783d5 Mon Sep 17 00:00:00 2001 From: Henrik Giesel Date: Tue, 13 Apr 2021 20:11:18 +0200 Subject: [PATCH 3/6] Remove jquery from reviewer.py - we no longer actually need to focus the default ease button --- qt/aqt/reviewer.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/qt/aqt/reviewer.py b/qt/aqt/reviewer.py index 6c054e934..62a968599 100644 --- a/qt/aqt/reviewer.py +++ b/qt/aqt/reviewer.py @@ -716,9 +716,7 @@ time = %(time)d; for ease, label in self._answerButtonList(): buf += but(ease, label) buf += "" - script = """ -""" - return buf + script + return buf def _buttonTime(self, i: int) -> str: if not self.mw.col.conf["estTimes"]: From 67754494d2bd049cd36d1f565066977c9abc8944 Mon Sep 17 00:00:00 2001 From: Henrik Giesel Date: Tue, 13 Apr 2021 20:26:06 +0200 Subject: [PATCH 4/6] Remvoe jQuery from deckbrowser.py It's not quite clear why jQuery was necessary here? --- qt/aqt/deckbrowser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt/aqt/deckbrowser.py b/qt/aqt/deckbrowser.py index b795a8401..80410a077 100644 --- a/qt/aqt/deckbrowser.py +++ b/qt/aqt/deckbrowser.py @@ -168,7 +168,7 @@ class DeckBrowser: gui_hooks.deck_browser_did_render(self) def _scrollToOffset(self, offset: int) -> None: - self.web.eval("$(function() { window.scrollTo(0, %d, 'instant'); });" % offset) + self.web.eval("window.scrollTo(0, %d, 'instant');" % offset) def _renderStats(self) -> str: return '
{}
'.format( From 3e1b42bb629f7890262409dbae6ec105184a54af Mon Sep 17 00:00:00 2001 From: Henrik Giesel Date: Tue, 13 Apr 2021 20:29:59 +0200 Subject: [PATCH 5/6] Satisfy formatter --- qt/aqt/browser/browser.py | 4 +++- qt/aqt/toolbar.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/qt/aqt/browser/browser.py b/qt/aqt/browser/browser.py index ac2cdeb5d..7737a2ff7 100644 --- a/qt/aqt/browser/browser.py +++ b/qt/aqt/browser/browser.py @@ -607,7 +607,9 @@ where id in %s""" def _on_preview_closed(self) -> None: if self.editor.web: - self.editor.web.eval("document.getElementById('previewButton').classList.remove('highlighted')") + self.editor.web.eval( + "document.getElementById('previewButton').classList.remove('highlighted')" + ) self._previewer = None # Card deletion diff --git a/qt/aqt/toolbar.py b/qt/aqt/toolbar.py index c4e11dfc7..a4b06a104 100644 --- a/qt/aqt/toolbar.py +++ b/qt/aqt/toolbar.py @@ -150,7 +150,9 @@ class Toolbar: def set_sync_active(self, active: bool) -> None: method = "add" if active else "remove" - self.web.eval(f"document.getElementById('sync-spinner').classList.{method}('spin')") + self.web.eval( + f"document.getElementById('sync-spinner').classList.{method}('spin')" + ) def set_sync_status(self, status: SyncStatus) -> None: self.web.eval(f"updateSyncColor({status.required})") From 280f78535b1c40460bac2a3737577df40f8dea39 Mon Sep 17 00:00:00 2001 From: Henrik Giesel Date: Tue, 13 Apr 2021 21:32:53 +0200 Subject: [PATCH 6/6] Replace jQuery in webview.py --- qt/aqt/webview.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt/aqt/webview.py b/qt/aqt/webview.py index 484a76622..475e5b148 100644 --- a/qt/aqt/webview.py +++ b/qt/aqt/webview.py @@ -599,7 +599,7 @@ body {{ zoom: {zoom}; background: {background}; direction: {lang_dir}; {font} }} self._bridge_context = None def adjustHeightToFit(self) -> None: - self.evalWithCallback("$(document.body).height()", self._onHeight) + self.evalWithCallback("document.documentElement.offsetHeight", self._onHeight) def _onHeight(self, qvar: Optional[int]) -> None: from aqt import mw