Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit c991041

Browse files
committed
Use thebelab tarball from npm
1 parent 51762c4 commit c991041

File tree

6 files changed

+16
-39
lines changed

6 files changed

+16
-39
lines changed

build/make/deps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ $(SAGE_EXTCODE)/%: $(SAGE_SRC)/ext/%
218218
# Building the documentation has many dependencies, because all
219219
# documented modules are imported and because we use matplotlib to
220220
# produce plots.
221-
DOC_DEPENDENCIES = sagelib $(inst_sphinx) $(inst_sagenb) \
221+
DOC_DEPENDENCIES = sagelib $(inst_sphinx) $(inst_sagenb) $(inst_thebelab) \
222222
| $(SAGERUNTIME) $(inst_maxima) $(inst_networkx) $(inst_scipy) $(inst_sympy) \
223223
$(inst_matplotlib) $(inst_pillow) $(inst_mathjax) $(inst_mpmath) \
224224
$(inst_ipykernel) $(inst_jupyter_client) $(inst_conway_polynomials) \

build/pkgs/thebelab/SPKG.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,3 @@ Home page: https://github.com/minrk/thebelab
2727
== Dependencies ==
2828

2929
* the jupyter notebook (for the installation)
30-
31-
== Special Update/Build Instructions ==
32-
33-
Run spkg-src

build/pkgs/thebelab/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=thebelab-VERSION.tgz
2-
sha1=e656a36a2cc3062688d097976e90e9fd9024c1d3
3-
md5=5663a095c38761fe2c0733e97056c57d
4-
cksum=1065555283
2+
sha1=6a35689efbbec7ae069b57b71dbfd1b2b1ca93a0
3+
md5=6a8adc12038537fa5caf3d076a4a23fb
4+
cksum=178615097

build/pkgs/thebelab/spkg-install

100755100644
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
jupyter nbextension install --sys-prefix src/thebelab.js
1+
cd src
2+
mv lib thebelab
3+
jupyter nbextension install --sys-prefix thebelab

build/pkgs/thebelab/spkg-src

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/doc/common/themes/sage/static/thebe_status_field.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Functions for the thebe activate button and status field
22
//
3-
//
3+
//
44

55
function thebe_place_activate_button(){
66
$('.thebe_status_field')
@@ -27,7 +27,7 @@ about=' (<a href="http://sage-package.readthedocs.io/en/latest/sage_package/theb
2727
server=''
2828

2929
messages = {
30-
'downloading': 'Downloading Thebe',
30+
'downloading': 'Downloading ThebeLab',
3131
'building': 'Building '+sagemath,
3232
'built': 'Built '+sagemath,
3333
'launching': 'Launching server',
@@ -38,14 +38,14 @@ messages = {
3838
}
3939

4040
function thebe_update_status_field(evt, data) {
41-
console.log("Thebe: status changed (" + data.status + "): " + data.message);
41+
console.log("ThebeLab: status changed (" + data.status + "): " + data.message);
4242
$(".thebe-status-field")
4343
.attr("class", "thebe-status-field thebe-status-" + data.status)
4444
.html(messages[data.status]+server+about);
4545
}
4646

4747
function thebe_bootstrap_local () {
48-
console.log("Thebe: using local server");
48+
console.log("ThebeLab: using local server");
4949
thebelab.on("status", thebe_update_status_field);
5050
thebelab.bootstrap({
5151
binderOptions: {repo: null},
@@ -59,7 +59,7 @@ function thebe_bootstrap_local () {
5959
}
6060

6161
function thebe_bootstrap_binder () {
62-
console.log("Thebe: using remote server on binder");
62+
console.log("ThebeLab: using remote server on binder");
6363
thebelab.on("status", thebe_update_status_field); // Duplicated with above; would be nicer as thebe option
6464
server = " on "+mybinder;
6565
thebelab.bootstrap();
@@ -68,8 +68,8 @@ function thebe_bootstrap_binder () {
6868
// Try downloading thebe remotely; if successfull call next_operation
6969
function thebe_download_remote(next_operation) {
7070
thebe_update_status_field({}, {status: 'downloading', message: ''})
71-
// Load the Thebe library
72-
$.getScript("https://unpkg.com/thebelab@^0.1.0")
71+
// Load the ThebeLab library
72+
$.getScript("https://unpkg.com/thebelab@^0.2.1")
7373
.done(function(script, textStatus) {
7474
next_operation()
7575
})
@@ -81,8 +81,8 @@ function thebe_download_remote(next_operation) {
8181

8282
// Try downloading thebe locally, or remotely if unavailable; if successfull call next_operation
8383
function thebe_download_local(next_operation) {
84-
console.log("Thebe: trying to get thebe from the nbextensions");
85-
$.getScript("/nbextensions/thebelab.js")
84+
console.log("ThebeLab: trying to get thebe from the nbextensions");
85+
$.getScript("/nbextensions/thebelab/index.js")
8686
.done(function(script, textStatus) {
8787
next_operation()
8888
})

0 commit comments

Comments
 (0)