Merge pull request #15980 from srid12/custom-variable-issue-15921

used regex instead of string replacing
This commit is contained in:
Torkel Ödegaard 2019-03-13 20:34:56 +01:00 committed by GitHub
commit bfc84c0f2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -40,7 +40,7 @@ export class CustomVariable implements Variable {
updateOptions() { updateOptions() {
// extract options in comma separated string (use backslash to escape wanted commas) // extract options in comma separated string (use backslash to escape wanted commas)
this.options = _.map(this.query.match(/(?:\\,|[^,])+/g), text => { this.options = _.map(this.query.match(/(?:\\,|[^,])+/g), text => {
text = text.replace('\\,', ','); text = text.replace(/\\,/g, ',');
return { text: text.trim(), value: text.trim() }; return { text: text.trim(), value: text.trim() };
}); });