diff --git a/src/widget/select.js b/src/widget/select.js index 8184d8f9ff95..2448d40cdf66 100644 --- a/src/widget/select.js +++ b/src/widget/select.js @@ -384,7 +384,7 @@ angularWidget('select', function(element){ if (existingOption.id !== option.id) { lastElement.val(existingOption.id = option.id); } - if (existingOption.selected !== option.selected) { + if (existingOption.element.selected !== option.selected) { lastElement.prop('selected', (existingOption.selected = option.selected)); } } else { diff --git a/test/widget/selectSpec.js b/test/widget/selectSpec.js index dd1dc0cb7eef..f75899cfa958 100644 --- a/test/widget/selectSpec.js +++ b/test/widget/selectSpec.js @@ -428,6 +428,22 @@ describe('select', function() { expect(select.val()).toEqual('0'); expect(select.find('option').length).toEqual(1); }); + + it('should select correct input if previously bound to something not in the list', function() { + createSingleSelect(); + scope.values = [{name:'A'},{name:'B'}]; + scope.selected = {}; + scope.$digest(); + expect(select.find('option').length).toEqual(3); + expect(select.val()).toEqual('?'); + expect(jqLite(select.find('option')[0]).val()).toEqual('?'); + + select.find('option').eq(1).prop('selected', true); + browserTrigger(select, 'change'); + expect(select.val()).toEqual('0'); + expect(select.find('option').eq(0).prop('selected')).toBeTruthy(); + expect(select.find('option').length).toEqual(2); + }); }); describe('on change', function() {