Merge pull request #151 from jcoady/master

Added isjupyterlab_vpython check

Author: jcoady

labextension/vpython/src/glowcommlab.js

@@ -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')
 
@@ -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:

vpython/vpython_libraries/glowcomm.html

@@ -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:

vpython/vpython_libraries/glowcomm.js

@@ -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: