From a9cfb160c91d8b1bfcc57d768e88d39d218a0170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 20 Aug 2014 11:48:00 +0200
Subject: [PATCH] Added typeahead to series overrides, #425

---
 src/app/components/timeSeries.js            | 2 ++
 src/app/panels/graph/seriesOverridesCtrl.js | 6 ++++++
 src/app/panels/graph/styleEditor.html       | 8 +++++---
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/app/components/timeSeries.js b/src/app/components/timeSeries.js
index c64b5931e7f..85c27f1da88 100644
--- a/src/app/components/timeSeries.js
+++ b/src/app/components/timeSeries.js
@@ -12,6 +12,8 @@ function (_, kbn) {
   }
 
   function matchSeriesOverride(aliasOrRegex, seriesAlias) {
+    if (!aliasOrRegex) { return false; }
+
     if (aliasOrRegex[0] === '/') {
       var match = aliasOrRegex.match(new RegExp('^/(.*?)/(g?i?m?y?)$'));
       var regex = new RegExp(match[1], match[2]);
diff --git a/src/app/panels/graph/seriesOverridesCtrl.js b/src/app/panels/graph/seriesOverridesCtrl.js
index cc6b240d474..4f54c6d0e6f 100644
--- a/src/app/panels/graph/seriesOverridesCtrl.js
+++ b/src/app/panels/graph/seriesOverridesCtrl.js
@@ -44,6 +44,12 @@ define([
       $scope.render();
     };
 
+    $scope.getSeriesNames = function() {
+      return _.map($scope.legend, function(info) {
+        return info.alias;
+      });
+    };
+
     $scope.updateCurrentOverrides = function() {
       $scope.currentOverrides = [];
       _.each($scope.overrideMenu, function(option) {
diff --git a/src/app/panels/graph/styleEditor.html b/src/app/panels/graph/styleEditor.html
index ec4f59b50b4..de7318d4500 100644
--- a/src/app/panels/graph/styleEditor.html
+++ b/src/app/panels/graph/styleEditor.html
@@ -72,8 +72,8 @@
 				<div class="grafana-target-inner">
 
 					<ul class="grafana-target-controls-left">
-						<li class="grafana-target-segment>"
-							<i class="icon-remove" ng-click="removeSeriesOverride(override)"></i>
+						<li class="grafana-target-segment">
+							<i class="icon-remove pointer" ng-click="removeSeriesOverride(override)"></i>
 						</li>
 					</ul>
 
@@ -84,7 +84,9 @@
 						<li>
 							<input type="text"
 										ng-model="override.alias"
-										ng-model-onblur ng-change="render()"
+                    bs-typeahead="getSeriesNames"
+										ng-blur="render()"
+										data-min-length=0 data-items=100
 										class="input-medium grafana-target-segment-input" >
 						</li>
 						<li class="grafana-target-segment" ng-repeat="option in currentOverrides">