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

feat(templating): more work on new variable handling code, #6048

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-09-17 11:28:45 +02:00
parent 46ebae7304
commit 4188c46f83
9 changed files with 192 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/features/templating/variable.ts
View File

@@ -1,9 +1,14 @@
///<reference path="../../headers/common.d.ts" />
import _ from 'lodash';
import kbn from 'app/core/utils/kbn';
export function containsVariable(str, variableName) {
if (!str) {
return false;
export function containsVariable(...args: any[]) {
var variableName = args[args.length-1];
var str = args[0] || '';
for (var i = 1; i < args.length-1; i++) {
str += args[i] || '';
}
variableName = kbn.regexEscape(variableName);
@@ -15,7 +20,8 @@ export function containsVariable(str, variableName) {
export interface Variable {
setValue(option);
updateOptions();
dependsOn(variableName);
dependsOn(variable);
setValueFromUrl(urlValue);
}