Implement fixes from GlowScript

Author: BruceSherwood

labextension/vpython/src/glowcommlab.js

@@ -537,7 +537,13 @@ function decode(data) {
                 }
 			} else if (textattrs.indexOf(attr) > -1) {
                 if (attr == 'choices') { // menu choices to be wrapped in a list
-                    val = m[3].split(' ')
+                    val = m[3].slice(2,-2)
+                    val = val.replace(/'/g, '') // remove quotes
+                    val = val.replace(/,/g, '') // remove commas
+                    let s = val.split(' ')
+                    val = []
+                    let a
+                    for (a of s) {val.push(a)}
                 } else {
                     // '\n' doesn't survive JSON transmission, so in vpython.py we replace '\n' with '<br>'
                     val = m[3].replace(/<br>/g, "\n")

vpython/vpython.py

@@ -3339,6 +3339,7 @@ class controls(baseObj):
     def setup(self, args):
         super(controls, self).__init__()  ## get idx, attrsupdt from baseObj
         ## default values of common attributes
+        self._disabled = False
         self._constructing = True
         argsToSend = []
         objName = args['_objName']

vpython/vpython_libraries/glowcomm.html

@@ -459,7 +459,13 @@
                 }
 			} else if (textattrs.indexOf(attr) > -1) {
                 if (attr == 'choices') { // menu choices to be wrapped in a list
-                    val = m[3].split(' ')
+                    val = m[3].slice(2,-2)
+                    val = val.replace(/'/g, '') // remove quotes
+                    val = val.replace(/,/g, '') // remove commas
+                    let s = val.split(' ')
+                    val = []
+                    let a
+                    for (a of s) {val.push(a)}
                 } else {
                     // '\n' doesn't survive JSON transmission, so in vpython.py we replace '\n' with '<br>'
                     val = m[3].replace(/<br>/g, "\n")
@@ -792,6 +798,7 @@
 				cfg.objName = obj
 				cfg.bind = control_handler
 				cfg = fix_location(cfg)
+                console.log(cfg.choices)
 				glowObjs[idx] = menu(cfg)
 				if (cfg['selected'] === 'None') {
 					cfg['selected'] = null                              

vpython/vpython_libraries/glowcomm.js

@@ -509,7 +509,13 @@ function decode(data) {
                 }
 			} else if (textattrs.indexOf(attr) > -1) {
                 if (attr == 'choices') { // menu choices to be wrapped in a list
-                    val = m[3].split(' ')
+                    val = m[3].slice(2,-2)
+                    val = val.replace(/'/g, '') // remove quotes
+                    val = val.replace(/,/g, '') // remove commas
+                    let s = val.split(' ')
+                    val = []
+                    let a
+                    for (a of s) {val.push(a)}
                 } else {
                     // '\n' doesn't survive JSON transmission, so in vpython.py we replace '\n' with '<br>'
                     val = m[3].replace(/<br>/g, "\n")