From 89854ac2b9b9c96e8fb6307d38d0ae0132308732 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sat, 9 Sep 2023 09:12:31 +1000 Subject: [PATCH] Apply some fixes from Abdo https://github.com/ankitects/anki/pull/2612#issuecomment-1712320801 --- qt/aqt/import_export/import_dialog.py | 6 ++++-- ts/import-anki-package/import-anki-package-base.scss | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/qt/aqt/import_export/import_dialog.py b/qt/aqt/import_export/import_dialog.py index 2318b47d3..e23e24907 100644 --- a/qt/aqt/import_export/import_dialog.py +++ b/qt/aqt/import_export/import_dialog.py @@ -3,6 +3,8 @@ from __future__ import annotations +import json + import aqt import aqt.deckconf import aqt.main @@ -48,9 +50,9 @@ class ImportDialog(QDialog): self.setLayout(layout) restoreGeom(self, self.TITLE, default_size=(800, 800)) - escaped_path = path.replace("'", r"\'") + escaped_path = json.dumps(path.replace("'", r"\'")) self.web.evalWithCallback( - f"anki.{self.SETUP_FUNCTION_NAME}('{escaped_path}');", + f"anki.{self.SETUP_FUNCTION_NAME}({escaped_path});", lambda _: self.web.setFocus(), ) self.setWindowTitle(tr.decks_import_file()) diff --git a/ts/import-anki-package/import-anki-package-base.scss b/ts/import-anki-package/import-anki-package-base.scss index 7c6cf484b..efcc43878 100644 --- a/ts/import-anki-package/import-anki-package-base.scss +++ b/ts/import-anki-package/import-anki-package-base.scss @@ -11,6 +11,7 @@ @import "bootstrap/scss/modal"; @import "bootstrap/scss/carousel"; @import "sass/bootstrap-forms"; +@import "sass/bootstrap-tooltip"; .night-mode { @include bootstrap-dark.night-mode;