8000 Simpler fix to menu choices by BruceSherwood · Pull Request #193 · vpython/vpython-jupyter · GitHub
[go: up one dir, main page]
Skip to content

Simpler fix to menu choices #193

New issue
Merged
merged 1 commit into from
Feb 1, 2022
Merged

Simpler fix to menu choices #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions labextension/vpython/src/glowcommlab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,13 +537,8 @@ function decode(data) {
vs = [Number(val[1]), Number(val[2]), Number(val[3]), Number(val[4])]
}
} else if (textattrs.indexOf(attr) > -1) {
if (attr == 'choices') { // menu choices are wrapped in a list
val = m[3].slice(1, -1) // remove outer brackets
val = val.replace(/'/g, '') // remove quotes
val = val.replace(/, /g, ',') // remove spaces after commas
let s = val.split(',')
val = []
for (let a of s) { val.push(a) }
if (attr == 'choices') { // menu choices are wrapped in a list
val = m[3].slice(2, -2).split("', '") // choices separated by ', '
} else {
// '\n' doesn't survive JSON transmission, so in vpython.py we replace '\n' with '<br>'
val = m[3].replace(/<br>/g, "\n")
Expand Down
9 changes: 2 additions & 7 deletions vpython/vpython_libraries/glowcomm.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,13 +454,8 @@
vs = [Number(val[1]), Number(val[2]), Number(val[3]), Number(val[4])]
}
} else if (textattrs.indexOf(attr) > -1) {
if (attr == 'choices') { // menu choices are wrapped in a list
val = m[3].slice(1, -1) // remove outer brackets
val = val.replace(/'/g, '') // remove quotes
val = val.replace(/, /g, ',') // remove spaces after commas
let s = val.split(',')
val = []
for (let a of s) { val.push(a) }
if (attr == 'choices') { // menu choices are wrapped in a list
val = m[3].slice(2, -2).split("', '") // choices separated by ', '
} else {
// '\n' doesn't survive JSON transmission, so in vpython.py we replace '\n' with '<br>'
val = m[3].replace(/<br>/g, "\n")
Expand Down
7 changes: 1 addition & 6 deletions vpython/vpython_libraries/glowcomm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,12 +505,7 @@ function decode(data) {
}
} else if (textattrs.indexOf(attr) > -1) {
if (attr == 'choices') { // menu choices are wrapped in a list
val = m[3].slice(1, -1) // remove outer brackets
val = val.replace(/'/g, '') // remove quotes
val = val.replace(/, /g, ',') // remove spaces after commas
let s = val.split(',')
val = []
for (let a of s) { val.push(a) }
val = m[3].slice(2, -2).split("', '") // choices separated by ', '
} else {
// '\n' doesn't survive JSON transmission, so in vpython.py we replace '\n' with '<br>'
val = m[3].replace(/<br>/g, "\n")
Expand Down
0