Skip to content

Replace most jQuery with vanilla JavaScript #17053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 25, 2020
Merged

Replace most jQuery with vanilla JavaScript #17053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9cdc6d
js: Rename nav_element to toolbar.
QuLogic Apr 3, 2020
c46699c
js: Remove hover state class change.
QuLogic Apr 7, 2020
5356ef0
Replace jquery by vanilla JS.
QuLogic Apr 7, 2020
4a1bc03
FIX: don't repr the figure numbers
tacaswell Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions examples/user_interfaces/embedding_webagg_sgskip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,15 @@ def create_figure():
window.open('download.' + format, '_blank');
};

$(document).ready(
function ready(fn) {
if (document.readyState != "loading") {
fn();
} else {
document.addEventListener("DOMContentLoaded", fn);
}
}

ready(
function() {
/* It is up to the application to provide a websocket that the figure
will use to communicate to the server. This websocket object can
Expand All @@ -89,7 +97,7 @@ def create_figure():
// A function called when a file type is selected for download
ondownload,
// The HTML element in which to place the figure
$('div#figure'));
document.getElementById("figure"));
}
);
</script>
Expand Down
36 changes: 22 additions & 14 deletions lib/matplotlib/backends/web_backend/all_figures.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,33 @@
<script src="{{ prefix }}/js/mpl.js"></script>

<script>
{% for (fig_id, fig_manager) in figures %}
$(document).ready(
function() {
var main_div = $('div#figures');
var figure_div = $('<div id="figure-div"/>')
main_div.append(figure_div);
function ready(fn) {
if (document.readyState != "loading") {
fn();
} else {
document.addEventListener("DOMContentLoaded", fn);
}
}

function figure_ready(fig_id) {
return function () {
var main_div = document.querySelector("div#figures");
var figure_div = document.createElement("div");
figure_div.id = "figure-div";
main_div.appendChild(figure_div);
var websocket_type = mpl.get_websocket_type();
var websocket = new websocket_type(
"{{ ws_uri }}" + "{{ fig_id }}" + "/ws");
var fig = new mpl.figure(
"{{ fig_id }}", websocket, mpl_ondownload, figure_div);
var websocket = new websocket_type("{{ ws_uri }}" + fig_id + "/ws");
var fig = new mpl.figure(fig_id, websocket, mpl_ondownload, figure_div);

fig.focus_on_mouseover = true;

$(fig.canvas).attr('tabindex', {{ fig_id }});
}
);
fig.canvas.setAttribute("tabindex", fig_id);
}
};

{% end %}
{% for (fig_id, fig_manager) in figures %}
ready(figure_ready({{ str(fig_id) }}));
{% end %}
</script>

<title>MPL | WebAgg current figures</title>
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/backends/web_backend/ipython_inline_figure.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
function init_figure{{ fig_id }}(e) {
$('div.output').off('resize');

var output_div = $(e.target).find('div.output_subarea');
var output_div = e.target.querySelector('div.output_subarea');
var websocket_type = mpl.get_websocket_type();
var websocket = new websocket_type(
"ws://" + window.location.hostname + ":{{ port }}{{ prefix}}/" +
Expand Down
Loading