Skip to content
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

Jump to bottom

fix: update usage of JQuery etc. #70

Merged
merged 2 commits into from
Feb 7, 2024
Merged

fix: update usage of JQuery etc. #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b2dadd
fix: separate JS lines by ;
agoose77 Feb 7, 2024
17de7f6
fix: do not use JQuery
agoose77 Feb 7, 2024
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
14 changes: 7 additions & 7 deletions src/sphinx_thebe/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ def init_thebe_core(app, env, docnames):

# Add configuration variables
THEBE_JS_URL = f"https://unpkg.com/thebe@{THEBE_VERSION}/lib/index.js"
thebe_config = f"""\
const THEBE_JS_URL = "{ THEBE_JS_URL }"
const thebe_selector = "{ app.config.thebe_config['selector'] }"
const thebe_selector_input = "{ app.config.thebe_config['selector_input'] }"
const thebe_selector_output = "{ app.config.thebe_config['selector_output'] }"
"""
app.add_js_file(None, body=dedent(thebe_config))
thebe_config_lines = [
f"const THEBE_JS_URL = \"{ THEBE_JS_URL }\"",
f"const thebe_selector = \"{ app.config.thebe_config['selector'] }\"",
f"const thebe_selector_input = \"{ app.config.thebe_config['selector_input'] }\"",
f"const thebe_selector_output = \"{ app.config.thebe_config['selector_output'] }\""
]
app.add_js_file(None, body='; '.join(thebe_config_lines))
app.add_js_file(filename="sphinx-thebe.js", **{"async": "async"})

if config_thebe.get("always_load") is True:
Expand Down
27 changes: 14 additions & 13 deletions src/sphinx_thebe/_static/sphinx-thebe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
var configureThebe = () => {
// Load thebe config in case we want to update it as some point
console.log("[sphinx-thebe]: Loading thebe config...");
thebe_config = $('script[type="text/x-thebe-config"]')[0];
thebe_config = document.querySelector("script[type=\"text/x-thebe-config\"]");

// If we already detect a Thebe cell, don't re-run
if (document.querySelectorAll("div.thebe-cell").length > 0) {
return;
}

// Update thebe buttons with loading message
$(".thebe-launch-button").each((ii, button) => {
document.querySelectorAll(".thebe-launch-button").forEach((button) => {
button.innerHTML = `
<div class="spinner">
<div class="rect1"></div>
Expand All @@ -28,14 +28,15 @@ var configureThebe = () => {
thebelab.on("status", function (evt, data) {
console.log("Status changed:", data.status, data.message);

$(".thebe-launch-button ")
.removeClass("thebe-status-" + thebeStatus)
.addClass("thebe-status-" + data.status)
.find(".loading-text")
.html(
"<span class='launch_msg'>Launching from mybinder.org: </span><span class='status'>" +
data.status +
"</span>"
const button = document.querySelector(".thebe-launch-button ");
button.classList.replace(
`thebe-status-${thebeStatus}`,
`thebe-status-${data.status}`
)
button.querySelector(".loading-text")
.innerHTML = (
`<span class='launch_msg'>Launching from mybinder.org: </span>
<span class='status'>${data.status}</span>`
);

// Now update our thebe status
Expand Down Expand Up @@ -76,8 +77,8 @@ var modifyDOMForThebe = () => {

// If we had an output, insert it just after the `pre` cell
if (codeCellOutput) {
$(codeCellOutput).attr("data-output", "");
$(codeCellOutput).insertAfter(codeCellText);
codeCellOutput.setAttribute("data-output", "");
codeCellText.insertAdjacentElement('afterend', codeCellOutput);
}
}

Expand All @@ -92,7 +93,7 @@ var initThebe = () => {
// Load thebe dynamically if it's not already loaded
if (typeof thebelab === "undefined") {
console.log("[sphinx-thebe]: Loading thebe from CDN...");
$(".thebe-launch-button ").text("Loading thebe from CDN...");
document.querySelector(".thebe-launch-button ").innerText = "Loading thebe from CDN...";

const script = document.createElement("script");
script.src = `${THEBE_JS_URL}`;
Expand Down
Loading