Skip to content

Commit d137ded

Browse files
committed
Instead of new var used the open variable as it is set on activate.
1 parent 84420c3 commit d137ded

File tree

2 files changed

+5
-22
lines changed

2 files changed

+5
-22
lines changed

src/uiSelectChoicesDirective.js

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ uis.directive('uiSelectChoices',
6767
scope.$watch('$select.search', function(newValue) {
6868
if(newValue && !$select.open && $select.multiple) $select.activate(false, true);
6969
$select.activeIndex = $select.tagging.isActivated ? -1 : 0;
70-
if ((!attrs.minimumInputLength || $select.search.length >= attrs.minimumInputLength) && (!$select.refreshOnActive || ($select.refreshOnActive && $select.refreshIsActive))) {
70+
if ((!attrs.minimumInputLength || $select.search.length >= attrs.minimumInputLength) && (!$select.refreshOnActive || ($select.refreshOnActive && $select.open))) {
7171
$select.refresh(attrs.refresh);
7272
} else {
7373
$select.items = [];
@@ -79,19 +79,14 @@ uis.directive('uiSelectChoices',
7979
var refreshDelay = scope.$eval(attrs.refreshDelay);
8080
$select.refreshDelay = refreshDelay !== undefined ? refreshDelay : uiSelectConfig.refreshDelay;
8181
});
82-
83-
if(!angular.isUndefined($select.refreshOnActive)){
84-
//only add a watch when refreshonactive is set.
85-
scope.$watch('$select.refreshIsActive', function(newValue, oldValue){
86-
if(angular.isUndefined(oldValue) && newValue){
87-
$select.refresh(attrs.refresh);
88-
}
89-
});
90-
}
9182

9283
scope.$watch('$select.open', function(open) {
9384
if (open) {
9485
tElement.attr('role', 'listbox');
86+
if(!angular.isUndefined($select.refreshOnActive)){
87+
//only add a watch when refreshonactive is set.
88+
$select.refresh(attrs.refresh);
89+
}
9590
} else {
9691
tElement.removeAttr('role');
9792
}

src/uiSelectController.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ uis.controller('uiSelectCtrl',
1919
ctrl.paste = uiSelectConfig.paste;
2020
ctrl.resetSearchInput = uiSelectConfig.resetSearchInput;
2121
ctrl.refreshing = false;
22-
ctrl.refreshOnActive = undefined;
23-
ctrl.refreshIsActive = undefined;
2422
ctrl.spinnerEnabled = uiSelectConfig.spinnerEnabled;
2523
ctrl.spinnerClass = uiSelectConfig.spinnerClass;
2624

@@ -111,14 +109,6 @@ uis.controller('uiSelectCtrl',
111109
return result;
112110
}
113111

114-
function _setrefreshIsActive(){
115-
//only set a value if the refreshOnActive attr is set.
116-
if(!angular.isUndefined(ctrl.refreshOnActive))
117-
{
118-
ctrl.refreshIsActive = true;
119-
}
120-
}
121-
122112
// When the user clicks on ui-select, displays the dropdown list
123113
ctrl.activate = function(initSearchValue, avoidReset) {
124114
if (!ctrl.disabled && !ctrl.open) {
@@ -129,8 +119,6 @@ uis.controller('uiSelectCtrl',
129119
ctrl.open = true;
130120

131121
ctrl.activeIndex = ctrl.activeIndex >= ctrl.items.length ? 0 : ctrl.activeIndex;
132-
133-
_setrefreshIsActive();
134122
// ensure that the index is set to zero for tagging variants
135123
// that where first option is auto-selected
136124
if ( ctrl.activeIndex === -1 && ctrl.taggingLabel !== false ) {

0 commit comments

Comments
 (0)