IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

replaced escape() call, renamed formatter to be more expressive

Browse Source
This commit is contained in:
Benjamin Schweizer
2018-08-06 21:54:12 +02:00
parent 7da9c33ae4
commit 9220f83b3d
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/app/features/templating/template_srv.ts
View File

@@ -83,6 +83,13 @@ export class TemplateSrv {
return '(' + quotedValues.join(' OR ') + ')';
}
// like encodeURIComponent() but for all characters except alpha-numerics
encodeURIQueryValue(str) {
return str.replace(/[^a-z0-9]/gi, function(c) {
return '%' + c.charCodeAt(0).toString(16);
});
}
formatValue(value, format, variable) {
// for some scopedVars there is no variable
variable = variable || {};
@@ -124,12 +131,12 @@ export class TemplateSrv {
}
return value;
}
case 'urlescape': {
case 'percentencode': {
// like glob, but url escaped
if (_.isArray(value)) {
return escape('{' + value.join(',') + '}');
return this.encodeURIQueryValue('{' + value.join(',') + '}');
}
return escape(value);
return this.encodeURIQueryValue(value);
}
default: {
if (_.isArray(value)) {