From d9357226bda07009746edd0bac525c8445e94694 Mon Sep 17 00:00:00 2001 From: Benoit de La Forest Date: Fri, 13 Jun 2014 14:40:20 +0200 Subject: [PATCH 1/2] Make select item active on popup close to have it highlighted the next time we open the popup --- src/select.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/select.js b/src/select.js index 44d09c2ca..ac004f404 100644 --- a/src/select.js +++ b/src/select.js @@ -200,6 +200,10 @@ angular.module('ui.select', []) // Closes the dropdown ctrl.close = function() { if (ctrl.open) { + //reset activeIndex + if (ctrl.selected && ctrl.items.length) { + ctrl.activeIndex = ctrl.items.indexOf(ctrl.selected); + } _resetSearchInput(); ctrl.open = false; } @@ -284,7 +288,7 @@ angular.module('ui.select', []) }]) .directive('uiSelect', - ['$document', 'uiSelectConfig', 'uiSelectMinErr', + ['$document', 'uiSelectConfig', 'uiSelectMinErr', function($document, uiSelectConfig, uiSelectMinErr) { return { From 478796cc68053aad78857488d4644043ed9c9023 Mon Sep 17 00:00:00 2001 From: Benoit de La Forest Date: Fri, 13 Jun 2014 14:57:05 +0200 Subject: [PATCH 2/2] Reset activeIndex at the same time we reset search input (instead of when we close popup) --- src/select.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/select.js b/src/select.js index ac004f404..f513fb402 100644 --- a/src/select.js +++ b/src/select.js @@ -129,6 +129,10 @@ angular.module('ui.select', []) function _resetSearchInput() { if (ctrl.resetSearchInput) { ctrl.search = EMPTY_SEARCH; + //reset activeIndex + if (ctrl.selected && ctrl.items.length) { + ctrl.activeIndex = ctrl.items.indexOf(ctrl.selected); + } } } @@ -200,10 +204,6 @@ angular.module('ui.select', []) // Closes the dropdown ctrl.close = function() { if (ctrl.open) { - //reset activeIndex - if (ctrl.selected && ctrl.items.length) { - ctrl.activeIndex = ctrl.items.indexOf(ctrl.selected); - } _resetSearchInput(); ctrl.open = false; }