From b85fe623894197ef045ef4f99a6e92774f3a65ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 20 Oct 2014 10:06:34 -0400 Subject: [PATCH] Graph: series override dropdown menu select did not work after recent commit that added typeahead to this dropdown --- src/app/directives/dropdown.typeahead.js | 11 +++++++++++ src/app/panels/graph/seriesOverridesCtrl.js | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/app/directives/dropdown.typeahead.js b/src/app/directives/dropdown.typeahead.js index e02b90b2576..f46de052c06 100644 --- a/src/app/directives/dropdown.typeahead.js +++ b/src/app/directives/dropdown.typeahead.js @@ -37,6 +37,17 @@ function (angular, app, _, $) { return memo; }, []); + $scope.menuItemSelected = function(optionIndex, valueIndex) { + var option = $scope.menuItems[optionIndex]; + var result = { + $item: option.submenu[valueIndex], + $optionIndex: optionIndex, + $valueIndex: valueIndex + }; + + $scope.dropdownTypeaheadOnSelect(result); + }; + $input.attr('data-provide', 'typeahead'); $input.typeahead({ source: typeaheadValues, diff --git a/src/app/panels/graph/seriesOverridesCtrl.js b/src/app/panels/graph/seriesOverridesCtrl.js index bf46b086bea..b677bf19e17 100644 --- a/src/app/panels/graph/seriesOverridesCtrl.js +++ b/src/app/panels/graph/seriesOverridesCtrl.js @@ -23,7 +23,7 @@ define([ option.submenu = _.map(values, function(value, index) { return { text: String(value), - click: 'setOverride(' + option.index + ',' + index + ')' + click: 'menuItemSelected(' + option.index + ',' + index + ')' }; });