diff --git a/qt/aqt/browser/browser.py b/qt/aqt/browser/browser.py index e053bf37d..ffbfc9b1b 100644 --- a/qt/aqt/browser/browser.py +++ b/qt/aqt/browser/browser.py @@ -611,7 +611,9 @@ 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 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( 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"]: diff --git a/qt/aqt/toolbar.py b/qt/aqt/toolbar.py index a8bd20bce..a4b06a104 100644 --- a/qt/aqt/toolbar.py +++ b/qt/aqt/toolbar.py @@ -149,11 +149,10 @@ 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})") diff --git a/qt/aqt/webview.py b/qt/aqt/webview.py index e9a3d1b17..7183e8677 100644 --- a/qt/aqt/webview.py +++ b/qt/aqt/webview.py @@ -601,7 +601,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