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/panel-triggers/editor.js
+++ b/src/panel-triggers/editor.js
@@ -141,15 +141,7 @@ class TriggerPanelEditorCtrl {
  }

  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);
  }
 }