Merge branch 'master' of github.com:grafana/grafana

2017-03-06 11:52:07 +01:00
parent 9f1c6a73f0 31866b5e57
commit ebdd35d799
1 changed files with 3 additions and 2 deletions
@@ -59,8 +59,9 @@ export class IntervalVariable implements Variable {
  }

  updateOptions() {
-   // extract options in comma separated string
-    this.options = _.map(this.query.split(/[,]+/), function(text) {
+    // extract options between quotes and/or comma
+    this.options = _.map(this.query.match(/(["'])(.*?)\1|\w+/g), function(text) {
+      text = text.replace(/["']+/g, '');
      return {text: text.trim(), value: text.trim()};
    });