GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-20 23:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Avoid building jquery to its own directory

Browse source
This commit is contained in:
Henrik Giesel 2020-12-28 14:18:07 +01:00
parent 37dcdcc4c0
commit 98407c3fea
11 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt/aqt/clayout.py
View file

@ -308,7 +308,7 @@ class CardLayout(QDialog):
qconnect(pform.preview_settings.clicked, self.on_preview_settings) qconnect(pform.preview_settings.clicked, self.on_preview_settings)
jsinc = [ jsinc = [
"js/vendor/jquery/jquery.min.js", "js/vendor/jquery.min.js",
"js/vendor/browsersel.js", "js/vendor/browsersel.js",
"js/mathjax.js", "js/mathjax.js",
"js/vendor/mathjax/tex-chtml.js", "js/vendor/mathjax/tex-chtml.js",

23
qt/aqt/data/web/js/vendor/BUILD.bazel vendored
View file

@ -1,8 +1,23 @@
load("//ts:jquery.bzl", "copy_jquery")
copy_jquery(
name = "jquery",
visibility = ["//visibility:public"],
)
files = [
"jquery",
]
directories = [
"mathjax",
]
filegroup( filegroup(
name = "vendor", name = "vendor",
srcs = glob(["*.js"]) + [ srcs = glob(["*.js"])
"//qt/aqt/data/web/js/vendor/mathjax", + ["//qt/aqt/data/web/js/vendor:{}".format(file) for file in files]
"//qt/aqt/data/web/js/vendor/jquery", + ["//qt/aqt/data/web/js/vendor/{}".format(dir) for dir in directories],
],
visibility = ["//qt:__subpackages__"], visibility = ["//qt:__subpackages__"],
) )

6
qt/aqt/data/web/js/vendor/jquery/BUILD.bazel vendored
View file

@ -1,6 +0,0 @@
load("//ts:jquery.bzl", "copy_jquery")
copy_jquery(
name = "jquery",
visibility = ["//visibility:public"],
)

2
qt/aqt/deckbrowser.py
View file

@ -124,7 +124,7 @@ class DeckBrowser:
self._body % content.__dict__, self._body % content.__dict__,
css=["css/deckbrowser.css"], css=["css/deckbrowser.css"],
js=[ js=[
"js/vendor/jquery/jquery.min.js", "js/vendor/jquery.min.js",
"js/vendor/jquery-ui.js", "js/vendor/jquery-ui.js",
"js/deckbrowser.js", "js/deckbrowser.js",
], ],

2
qt/aqt/editor.py
View file

@ -217,7 +217,7 @@ class Editor:
self.web.stdHtml( self.web.stdHtml(
_html % (bgcol, bgcol, topbuts, tr(TR.EDITING_SHOW_DUPLICATES)), _html % (bgcol, bgcol, topbuts, tr(TR.EDITING_SHOW_DUPLICATES)),
css=["css/editor.css"], 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, context=self,
) )

2
qt/aqt/overview.py
View file

@ -173,7 +173,7 @@ class Overview:
self.web.stdHtml( self.web.stdHtml(
self._body % content.__dict__, self._body % content.__dict__,
css=["css/overview.css"], 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, context=self,
) )

2
qt/aqt/previewer.py
View file

@ -110,7 +110,7 @@ class Previewer(QDialog):
def _setup_web_view(self): def _setup_web_view(self):
jsinc = [ jsinc = [
"js/vendor/jquery/jquery.min.js", "js/vendor/jquery.min.js",
"js/vendor/browsersel.js", "js/vendor/browsersel.js",
"js/mathjax.js", "js/mathjax.js",
"js/vendor/mathjax/tex-chtml.js", "js/vendor/mathjax/tex-chtml.js",

4
qt/aqt/reviewer.py
View file

@ -158,7 +158,7 @@ class Reviewer:
self.revHtml(), self.revHtml(),
css=["css/reviewer.css"], css=["css/reviewer.css"],
js=[ js=[
"js/vendor/jquery/jquery.min.js", "js/vendor/jquery.min.js",
"js/vendor/browsersel.js", "js/vendor/browsersel.js",
"js/mathjax.js", "js/mathjax.js",
"js/vendor/mathjax/tex-chtml.js", "js/vendor/mathjax/tex-chtml.js",
@ -171,7 +171,7 @@ class Reviewer:
self.bottom.web.stdHtml( self.bottom.web.stdHtml(
self._bottomHTML(), self._bottomHTML(),
css=["css/toolbar-bottom.css", "css/reviewer-bottom.css"], 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), context=ReviewerBottomBar(self),
) )

2
qt/aqt/stats.py
View file

@ -177,7 +177,7 @@ class DeckStats(QDialog):
self.form.web.title = "deck stats" self.form.web.title = "deck stats"
self.form.web.stdHtml( self.form.web.stdHtml(
"<html><body>" + self.report + "</body></html>", "<html><body>" + self.report + "</body></html>",
js=["js/vendor/jquery/jquery.min.js", "js/vendor/plot.js"], js=["js/vendor/jquery.min.js", "js/vendor/plot.js"],
context=self, context=self,
) )
self.mw.progress.finish() self.mw.progress.finish()

2
qt/aqt/toolbar.py
View file

@ -48,7 +48,7 @@ class Toolbar:
self.web.stdHtml( self.web.stdHtml(
self._body % self._centerLinks(), self._body % self._centerLinks(),
css=["css/toolbar.css"], 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, context=web_context,
) )
self.web.adjustHeightToFit() self.web.adjustHeightToFit()

2
qt/aqt/webview.py
View file

@ -440,7 +440,7 @@ body {{ zoom: {zoom}; background: {background}; direction: {lang_dir}; {font} }}
body=body, body=body,
head=head, head=head,
js=["js/webview.js"] 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), css=["css/webview.css"] + ([] if css is None else css),
) )