Skip to content
This repository was archived by the owner on Oct 2, 2019. It is now read-only.

Commit a322809

Browse files
committed
Merge pull request #703 from angular-ui/fix-default-attrs
fix(uiSelectController): controller variables with correct default values
2 parents 6e81746 + 2f4d247 commit a322809

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/uiSelectController.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ uis.controller('uiSelectCtrl',
1212

1313
var EMPTY_SEARCH = '';
1414

15-
ctrl.placeholder = undefined;
15+
ctrl.placeholder = uiSelectConfig.placeholder;
1616
ctrl.search = EMPTY_SEARCH;
1717
ctrl.activeIndex = 0;
1818
ctrl.activeMatchIndex = -1;
@@ -21,16 +21,16 @@ uis.controller('uiSelectCtrl',
2121
ctrl.open = false;
2222
ctrl.focus = false;
2323
ctrl.focusser = undefined; //Reference to input element used to handle focus events
24-
ctrl.disabled = undefined; // Initialized inside uiSelect directive link function
25-
ctrl.searchEnabled = undefined; // Initialized inside uiSelect directive link function
26-
ctrl.sortable = undefined; // Initialized inside uiSelect directive link function
27-
ctrl.resetSearchInput = undefined; // Initialized inside uiSelect directive link function
28-
ctrl.refreshDelay = undefined; // Initialized inside uiSelectChoices directive link function
29-
ctrl.multiple = false; // Initialized inside uiSelect directive link function
30-
ctrl.disableChoiceExpression = undefined; // Initialized inside uiSelect directive link function
24+
ctrl.disabled = false;
25+
ctrl.searchEnabled = uiSelectConfig.searchEnabled;
26+
ctrl.sortable = uiSelectConfig.sortable;
27+
ctrl.resetSearchInput = true;
28+
ctrl.multiple = undefined; // Initialized inside uiSelect directive link function
29+
ctrl.refreshDelay = uiSelectConfig.refreshDelay;
30+
ctrl.disableChoiceExpression = undefined; // Initialized inside uiSelectChoices directive link function
3131
ctrl.tagging = {isActivated: false, fct: undefined};
3232
ctrl.taggingTokens = {isActivated: false, tokens: undefined};
33-
ctrl.lockChoiceExpression = undefined; // Initialized inside uiSelect directive link function
33+
ctrl.lockChoiceExpression = undefined; // Initialized inside uiSelectMatch directive link function
3434
ctrl.closeOnSelect = true; // Initialized inside uiSelect directive link function
3535
ctrl.clickTriggeredSelect = false;
3636
ctrl.$filter = $filter;

0 commit comments

Comments
 (0)