diff --git a/src/uiSelectController.js b/src/uiSelectController.js index c0a1a94ac..4f1753c66 100644 --- a/src/uiSelectController.js +++ b/src/uiSelectController.js @@ -145,7 +145,7 @@ uis.controller('uiSelectCtrl', data = data || ctrl.parserResult.source($scope); var selectedItems = ctrl.selected; //TODO should implement for single mode removeSelected - if ((angular.isArray(selectedItems) && !selectedItems.length) || !ctrl.removeSelected) { + if (ctrl.isEmpty() || (angular.isArray(selectedItems) && !selectedItems.length) || !ctrl.removeSelected) { ctrl.setItemsFn(data); }else{ if ( data !== undefined ) { diff --git a/src/uiSelectMultipleDirective.js b/src/uiSelectMultipleDirective.js index b1e997ec5..141470747 100644 --- a/src/uiSelectMultipleDirective.js +++ b/src/uiSelectMultipleDirective.js @@ -56,7 +56,7 @@ uis.directive('uiSelectMultiple', ['uiSelectMinErr','$timeout', function(uiSelec ctrl.getPlaceholder = function(){ //Refactor single? - if($select.selected.length) return; + if($select.selected && $select.selected.length) return; return $select.placeholder; };