@@ -135,8 +135,7 @@ function MdAutocompleteCtrl ($scope, $element, $mdUtil, $mdConstant, $mdTheming,
135
135
$attrs . $observe ( 'disabled' , function ( value ) { ctrl . isDisabled = value ; } ) ;
136
136
$attrs . $observe ( 'required' , function ( value ) { ctrl . isRequired = value !== null ; } ) ;
137
137
$scope . $watch ( 'searchText' , wait ? $mdUtil . debounce ( handleSearchText , wait ) : handleSearchText ) ;
138
- registerSelectedItemWatcher ( selectedItemChange ) ;
139
- $scope . $watch ( 'selectedItem' , handleSelectedItemChange ) ;
138
+ $scope . $watch ( 'selectedItem' , selectedItemChange ) ;
140
139
angular . element ( $window ) . on ( 'resize' , positionDropdown ) ;
141
140
$scope . $on ( '$destroy' , cleanup ) ;
142
141
}
@@ -236,6 +235,7 @@ function MdAutocompleteCtrl ($scope, $element, $mdUtil, $mdConstant, $mdTheming,
236
235
if ( selectedItem ) {
237
236
getDisplayValue ( selectedItem ) . then ( function ( val ) {
238
237
$scope . searchText = val ;
238
+ handleSelectedItemChange ( selectedItem , previousSelectedItem ) ;
239
239
} ) ;
240
240
}
241
241
@@ -249,6 +249,9 @@ function MdAutocompleteCtrl ($scope, $element, $mdUtil, $mdConstant, $mdTheming,
249
249
angular . isFunction ( $scope . itemChange ) && $scope . itemChange ( getItemAsNameVal ( $scope . selectedItem ) ) ;
250
250
}
251
251
252
+ /**
253
+ * Use the user-defined expression to announce changes each time the search text is changed
254
+ */
252
255
function announceTextChange ( ) {
253
256
angular . isFunction ( $scope . textChange ) && $scope . textChange ( ) ;
254
257
}
@@ -260,9 +263,7 @@ function MdAutocompleteCtrl ($scope, $element, $mdUtil, $mdConstant, $mdTheming,
260
263
* @param previousSelectedItem
261
264
*/
262
265
function handleSelectedItemChange ( selectedItem , previousSelectedItem ) {
263
- for ( var i = 0 ; i < selectedItemWatchers . length ; ++ i ) {
264
- selectedItemWatchers [ i ] ( selectedItem , previousSelectedItem ) ;
265
- }
266
+ selectedItemWatchers . forEach ( function ( watcher ) { watcher ( selectedItem , previousSelectedItem ) ; } ) ;
266
267
}
267
268
268
269
/**
0 commit comments