Skip to content

Added isjupyterlab_vpython check #151

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 3 commits into from
Apr 26, 2021
Merged

Added isjupyterlab_vpython check #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc3e5f8
Added isjupyterlab_vpython check
jcoady Apr 26, 2021
2f2adcd
Added isjupyterlab_vpython check
jcoady Apr 26, 2021
260fcea
Added isjupyterlab_vpython check
jcoady Apr 26, 2021
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
34 changes: 20 additions & 14 deletions labextension/vpython/src/glowcommlab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import '!!file-loader?name=/vpython_data/[name].[ext]!../vpython_data/wood_textu
export var comm
var ws = null
var isopen = false
var isjupyterlab_vpython = true

console.log('START OF GLOWCOMM')

Expand Down Expand Up @@ -819,20 +820,25 @@ function handle_cmds(dcmds) {
case 'local_light': {glowObjs[idx] = local_light(cfg); break}
case 'distant_light': {glowObjs[idx] = distant_light(cfg); break}
case 'canvas': {
var container = document.getElementById("glowscript");
if (container !== null) {
window.__context = { glowscript_container: $("#glowscript").removeAttr("id")}
}
glowObjs[idx] = canvas(cfg)
glowObjs[idx]['idx'] = idx
try{
glowObjs[idx].wrapper[0].addEventListener("contextmenu", function(event){
event.preventDefault();
event.stopPropagation();
});
}
catch(err) {
console.log("glowcomm canvas contextmenu event : ",err.message);
if ((typeof isjupyterlab_vpython !== 'undefined') && (isjupyterlab_vpython === true)) {
var container = document.getElementById("glowscript");
if (container !== null) {
window.__context = { glowscript_container: $("#glowscript").removeAttr("id")}
}
glowObjs[idx] = canvas(cfg)
glowObjs[idx]['idx'] = idx
try{
glowObjs[idx].wrapper[0].addEventListener("contextmenu", function(event){
event.preventDefault();
event.stopPropagation();
});
}
catch(err) {
console.log("glowcomm canvas contextmenu event : ",err.message);
}
} else {
glowObjs[idx] = canvas(cfg)
glowObjs[idx]['idx'] = idx
}
break
// Display frames per second and render time:
Expand Down
33 changes: 19 additions & 14 deletions vpython/vpython_libraries/glowcomm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,20 +723,25 @@
case 'local_light': {glowObjs[idx] = local_light(cfg); break}
case 'distant_light': {glowObjs[idx] = distant_light(cfg); break}
case 'canvas': {
var container = document.getElementById("glowscript");
if (container !== null) {
window.__context = { glowscript_container: $("#glowscript").removeAttr("id")}
}
glowObjs[idx] = canvas(cfg)
glowObjs[idx]['idx'] = idx
try{
glowObjs[idx].wrapper[0].addEventListener("contextmenu", function(event){
event.preventDefault();
event.stopPropagation();
});
}
catch(err) {
console.log("glowcomm canvas contextmenu event : ",err.message);
if ((typeof isjupyterlab_vpython !== 'undefined') && (isjupyterlab_vpython === true)) {
var container = document.getElementById("glowscript");
if (container !== null) {
window.__context = { glowscript_container: $("#glowscript").removeAttr("id")}
}
glowObjs[idx] = canvas(cfg)
glowObjs[idx]['idx'] = idx
try{
glowObjs[idx].wrapper[0].addEventListener("contextmenu", function(event){
event.preventDefault();
event.stopPropagation();
});
}
catch(err) {
console.log("glowcomm canvas contextmenu event : ",err.message);
}
} else {
glowObjs[idx] = canvas(cfg)
glowObjs[idx]['idx'] = idx
}
break
// Display frames per second and render time:
Expand Down
33 changes: 19 additions & 14 deletions vpython/vpython_libraries/glowcomm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,20 +774,25 @@ function handle_cmds(dcmds) {
case 'local_light': {glowObjs[idx] = local_light(cfg); break}
case 'distant_light': {glowObjs[idx] = distant_light(cfg); break}
case 'canvas': {
var container = document.getElementById("glowscript");
if (container !== null) {
window.__context = { glowscript_container: $("#glowscript").removeAttr("id")}
}
glowObjs[idx] = canvas(cfg)
glowObjs[idx]['idx'] = idx
try{
glowObjs[idx].wrapper[0].addEventListener("contextmenu", function(event){
event.preventDefault();
event.stopPropagation();
});
}
catch(err) {
console.log("glowcomm canvas contextmenu event : ",err.message);
if ((typeof isjupyterlab_vpython !== 'undefined') && (isjupyterlab_vpython === true)) {
var container = document.getElementById("glowscript");
if (container !== null) {
window.__context = { glowscript_container: $("#glowscript").removeAttr("id")}
}
glowObjs[idx] = canvas(cfg)
glowObjs[idx]['idx'] = idx
try{
glowObjs[idx].wrapper[0].addEventListener("contextmenu", function(event){
event.preventDefault();
event.stopPropagation();
});
}
catch(err) {
console.log("glowcomm canvas contextmenu event : ",err.message);
}
} else {
glowObjs[idx] = canvas(cfg)
glowObjs[idx]['idx'] = idx
}
break
// Display frames per second and render time:
Expand Down