Zabbix plugin refactor.

2016-04-14 12:55:23 +03:00
parent 6639ebef80
commit fb24637364
4 changed files with 14 additions and 47 deletions
--- a/src/datasource-zabbix/query.controller.js
+++ b/src/datasource-zabbix/query.controller.js
@@ -178,26 +178,12 @@ export class ZabbixQueryController extends QueryCtrl {
    }
  }

-  onTargetPartChange(targetPart) {
-    /*var regexStyle = {'color': '#CCA300'};
-    targetPart.isRegex = utils.isRegex(targetPart.filter);
-    targetPart.style = targetPart.isRegex ? regexStyle : {};*/
-  }
-
  isRegex(str) {
    return utils.isRegex(str);
  }

  isVariable(str) {
-    var variablePattern = /^\$\w+/;
-    if (variablePattern.test(str)) {
-      var variables = _.map(this.templateSrv.variables, variable => {
-        return '$' + variable.name;
-      });
-      return _.contains(variables, str);
-    } else {
-      return false;
-    }
+    return utils.isTemplateVariable(str, this.templateSrv.variables);
  }

  onTargetBlur() {