From 37dcdcc4c05192d0a3f94d9403dcc3c66bd373c3 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Mon, 21 Dec 2020 04:20:55 +0100
Subject: [PATCH] Rename references from vendor/jquery.js to
 vendor/jquery/jquery.min.js

---
 qt/aqt/clayout.py     | 2 +-
 qt/aqt/deckbrowser.py | 6 +++++-
 qt/aqt/editor.py      | 2 +-
 qt/aqt/overview.py    | 2 +-
 qt/aqt/previewer.py   | 2 +-
 qt/aqt/reviewer.py    | 4 ++--
 qt/aqt/stats.py       | 2 +-
 qt/aqt/toolbar.py     | 2 +-
 qt/aqt/webview.py     | 3 ++-
 9 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/qt/aqt/clayout.py b/qt/aqt/clayout.py
index 3b793d5f8..412a16025 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.js",
+            "js/vendor/jquery/jquery.min.js",
             "js/vendor/browsersel.js",
             "js/mathjax.js",
             "js/vendor/mathjax/tex-chtml.js",
diff --git a/qt/aqt/deckbrowser.py b/qt/aqt/deckbrowser.py
index 24f0f9df0..ceac85be1 100644
--- a/qt/aqt/deckbrowser.py
+++ b/qt/aqt/deckbrowser.py
@@ -123,7 +123,11 @@ class DeckBrowser:
         self.web.stdHtml(
             self._body % content.__dict__,
             css=["css/deckbrowser.css"],
-            js=["js/vendor/jquery.js", "js/vendor/jquery-ui.js", "js/deckbrowser.js"],
+            js=[
+                "js/vendor/jquery/jquery.min.js",
+                "js/vendor/jquery-ui.js",
+                "js/deckbrowser.js",
+            ],
             context=self,
         )
         self.web.key = "deckBrowser"
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 79a1dde15..f6743217b 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.js", "js/editor.js"],
+            js=["js/vendor/jquery/jquery.min.js", "js/editor.js"],
             context=self,
         )
 
diff --git a/qt/aqt/overview.py b/qt/aqt/overview.py
index 2d0ed63bb..d848e91d9 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.js", "js/overview.js"],
+            js=["js/vendor/jquery/jquery.min.js", "js/overview.js"],
             context=self,
         )
 
diff --git a/qt/aqt/previewer.py b/qt/aqt/previewer.py
index 560050d6d..b437225da 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.js",
+            "js/vendor/jquery/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 51db9da75..fa721a35e 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.js",
+                "js/vendor/jquery/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.js", "js/reviewer-bottom.js"],
+            js=["js/vendor/jquery/jquery.min.js", "js/reviewer-bottom.js"],
             context=ReviewerBottomBar(self),
         )
 
diff --git a/qt/aqt/stats.py b/qt/aqt/stats.py
index f6376488a..3a950fcb8 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(
             "<html><body>" + self.report + "</body></html>",
-            js=["js/vendor/jquery.js", "js/vendor/plot.js"],
+            js=["js/vendor/jquery/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 a6585d3e4..9ae7ee90a 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.js", "js/toolbar.js"],
+            js=["js/webview.js", "js/vendor/jquery/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 1982bc2d4..4125402b2 100644
--- a/qt/aqt/webview.py
+++ b/qt/aqt/webview.py
@@ -439,7 +439,8 @@ body {{ zoom: {zoom}; background: {background}; direction: {lang_dir}; {font} }}
         web_content = WebContent(
             body=body,
             head=head,
-            js=["js/webview.js"] + (["js/vendor/jquery.js"] if js is None else js),
+            js=["js/webview.js"]
+            + (["js/vendor/jquery/jquery.min.js"] if js is None else js),
             css=["css/webview.css"] + ([] if css is None else css),
         )