diff --git a/qt/aqt/clayout.py b/qt/aqt/clayout.py index 412a16025..9dd79a81e 100644 --- a/qt/aqt/clayout.py +++ b/qt/aqt/clayout.py @@ -308,7 +308,7 @@ class CardLayout(QDialog): qconnect(pform.preview_settings.clicked, self.on_preview_settings) jsinc = [ - "js/vendor/jquery/jquery.min.js", + "js/vendor/jquery.min.js", "js/vendor/browsersel.js", "js/mathjax.js", "js/vendor/mathjax/tex-chtml.js", diff --git a/qt/aqt/data/web/js/vendor/BUILD.bazel b/qt/aqt/data/web/js/vendor/BUILD.bazel index 46fccdb93..67c626e75 100644 --- a/qt/aqt/data/web/js/vendor/BUILD.bazel +++ b/qt/aqt/data/web/js/vendor/BUILD.bazel @@ -1,8 +1,23 @@ +load("//ts:jquery.bzl", "copy_jquery") + +copy_jquery( + name = "jquery", + visibility = ["//visibility:public"], +) + + +files = [ + "jquery", +] + +directories = [ + "mathjax", +] + filegroup( name = "vendor", - srcs = glob(["*.js"]) + [ - "//qt/aqt/data/web/js/vendor/mathjax", - "//qt/aqt/data/web/js/vendor/jquery", - ], + srcs = glob(["*.js"]) + + ["//qt/aqt/data/web/js/vendor:{}".format(file) for file in files] + + ["//qt/aqt/data/web/js/vendor/{}".format(dir) for dir in directories], visibility = ["//qt:__subpackages__"], ) diff --git a/qt/aqt/data/web/js/vendor/jquery/BUILD.bazel b/qt/aqt/data/web/js/vendor/jquery/BUILD.bazel deleted file mode 100644 index cc5926308..000000000 --- a/qt/aqt/data/web/js/vendor/jquery/BUILD.bazel +++ /dev/null @@ -1,6 +0,0 @@ -load("//ts:jquery.bzl", "copy_jquery") - -copy_jquery( - name = "jquery", - visibility = ["//visibility:public"], -) diff --git a/qt/aqt/deckbrowser.py b/qt/aqt/deckbrowser.py index ceac85be1..9ce08802d 100644 --- a/qt/aqt/deckbrowser.py +++ b/qt/aqt/deckbrowser.py @@ -124,7 +124,7 @@ class DeckBrowser: self._body % content.__dict__, css=["css/deckbrowser.css"], js=[ - "js/vendor/jquery/jquery.min.js", + "js/vendor/jquery.min.js", "js/vendor/jquery-ui.js", "js/deckbrowser.js", ], diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py index f6743217b..546584de5 100644 --- a/qt/aqt/editor.py +++ b/qt/aqt/editor.py @@ -217,7 +217,7 @@ class Editor: self.web.stdHtml( _html % (bgcol, bgcol, topbuts, tr(TR.EDITING_SHOW_DUPLICATES)), css=["css/editor.css"], - js=["js/vendor/jquery/jquery.min.js", "js/editor.js"], + js=["js/vendor/jquery.min.js", "js/editor.js"], context=self, ) diff --git a/qt/aqt/overview.py b/qt/aqt/overview.py index d848e91d9..08a514862 100644 --- a/qt/aqt/overview.py +++ b/qt/aqt/overview.py @@ -173,7 +173,7 @@ class Overview: self.web.stdHtml( self._body % content.__dict__, css=["css/overview.css"], - js=["js/vendor/jquery/jquery.min.js", "js/overview.js"], + js=["js/vendor/jquery.min.js", "js/overview.js"], context=self, ) diff --git a/qt/aqt/previewer.py b/qt/aqt/previewer.py index b437225da..e5cc3fe3d 100644 --- a/qt/aqt/previewer.py +++ b/qt/aqt/previewer.py @@ -110,7 +110,7 @@ class Previewer(QDialog): def _setup_web_view(self): jsinc = [ - "js/vendor/jquery/jquery.min.js", + "js/vendor/jquery.min.js", "js/vendor/browsersel.js", "js/mathjax.js", "js/vendor/mathjax/tex-chtml.js", diff --git a/qt/aqt/reviewer.py b/qt/aqt/reviewer.py index fa721a35e..aa0be2508 100644 --- a/qt/aqt/reviewer.py +++ b/qt/aqt/reviewer.py @@ -158,7 +158,7 @@ class Reviewer: self.revHtml(), css=["css/reviewer.css"], js=[ - "js/vendor/jquery/jquery.min.js", + "js/vendor/jquery.min.js", "js/vendor/browsersel.js", "js/mathjax.js", "js/vendor/mathjax/tex-chtml.js", @@ -171,7 +171,7 @@ class Reviewer: self.bottom.web.stdHtml( self._bottomHTML(), css=["css/toolbar-bottom.css", "css/reviewer-bottom.css"], - js=["js/vendor/jquery/jquery.min.js", "js/reviewer-bottom.js"], + js=["js/vendor/jquery.min.js", "js/reviewer-bottom.js"], context=ReviewerBottomBar(self), ) diff --git a/qt/aqt/stats.py b/qt/aqt/stats.py index 3a950fcb8..01c0b74db 100644 --- a/qt/aqt/stats.py +++ b/qt/aqt/stats.py @@ -177,7 +177,7 @@ class DeckStats(QDialog): self.form.web.title = "deck stats" self.form.web.stdHtml( "" + self.report + "", - js=["js/vendor/jquery/jquery.min.js", "js/vendor/plot.js"], + js=["js/vendor/jquery.min.js", "js/vendor/plot.js"], context=self, ) self.mw.progress.finish() diff --git a/qt/aqt/toolbar.py b/qt/aqt/toolbar.py index 9ae7ee90a..8214966e2 100644 --- a/qt/aqt/toolbar.py +++ b/qt/aqt/toolbar.py @@ -48,7 +48,7 @@ class Toolbar: self.web.stdHtml( self._body % self._centerLinks(), css=["css/toolbar.css"], - js=["js/webview.js", "js/vendor/jquery/jquery.min.js", "js/toolbar.js"], + js=["js/webview.js", "js/vendor/jquery.min.js", "js/toolbar.js"], context=web_context, ) self.web.adjustHeightToFit() diff --git a/qt/aqt/webview.py b/qt/aqt/webview.py index 4125402b2..8623a62f6 100644 --- a/qt/aqt/webview.py +++ b/qt/aqt/webview.py @@ -440,7 +440,7 @@ body {{ zoom: {zoom}; background: {background}; direction: {lang_dir}; {font} }} body=body, head=head, js=["js/webview.js"] - + (["js/vendor/jquery/jquery.min.js"] if js is None else js), + + (["js/vendor/jquery.min.js"] if js is None else js), css=["css/webview.css"] + ([] if css is None else css), )