8000 Merge pull request #13446 from tacaswell/auto-backport-of-pr-11246-on… · matplotlib/matplotlib@4677728 · GitHub
[go: up one dir, main page]

Skip to content

Commit 4677728

Browse files
authored
Merge pull request #13446 from tacaswell/auto-backport-of-pr-11246-on-v3.0.x
Merge pull request #11246 from anntzer/download-jquery
2 parents 16fdf8d + 3b5678a commit 4677728

24 files changed

+225
-17948
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,8 @@ lib/z.lib
9595
#################
9696

9797
.ipynb_checkpoints/
98+
99+
# Vendored dependencies #
100+
#########################
101+
102+
jquery-ui-*/

examples/user_interfaces/embedding_webagg_sgskip.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ def create_figure():
5757
<link rel="stylesheet" href="_static/css/page.css" type="text/css">
5858
<link rel="stylesheet" href="_static/css/boilerplate.css" type="text/css" />
5959
<link rel="stylesheet" href="_static/css/fbm.css" type="text/css" />
60-
<link rel="stylesheet" href="_static/jquery/css/themes/base/jquery-ui.min.css" >
61-
<script src="_static/jquery/js/jquery-1.11.3.min.js"></script>
62-
<script src="_static/jquery/js/jquery-ui.min.js"></script>
60+
<link rel="stylesheet" href="_static/jquery-ui-1.12.1/jquery-ui.min.css" >
61+
<script src="_static/jquery-ui-1.12.1/external/jquery/jquery.js"></script>
62+
<script src="_static/jquery-ui-1.12.1/jquery-ui.min.js"></script>
6363
<script src="mpl.js"></script>
6464
6565
<script>

lib/matplotlib/backends/web_backend/all_figures.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<link rel="stylesheet" href="{{ prefix }}/_static/css/page.css" type="text/css">
44
<link rel="stylesheet" href="{{ prefix }}/_static/css/boilerplate.css" type="text/css" />
55
<link rel="stylesheet" href="{{ prefix }}/_static/css/fbm.css" type="text/css" />
6-
<link rel="stylesheet" href="{{ prefix }}/_static/jquery/css/themes/base/jquery-ui.min.css" >
7-
<script src="{{ prefix }}/_static/jquery/js/jquery-1.11.3.min.js"></script>
8-
<script src="{{ prefix }}/_static/jquery/js/jquery-ui.min.js"></script>
6+
<link rel="stylesheet" href="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.css" >
7+
<script src="{{ prefix }}/_static/jquery-ui-1.12.1/external/jquery/jquery.js"></script>
8+
<script src="{{ prefix }}/_static/jquery-ui-1.12.1/jquery-ui.min.js"></script>
99
<script src="{{ prefix }}/_static/js/mpl_tornado.js"></script>
1010
<script src="{{ prefix }}/js/mpl.js"></script>
1111

0 commit comments

Comments
 (0)
0