Skip to content
This repository has been archived by the owner on Apr 12, 2024. It is now read-only.

fix select: with ngOptions and ngMultiple #3230

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/ng/directive/select.js
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,15 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {
});
}

if (optionsExp) Options(scope, element, ngModelCtrl);

if (optionsExp) {
scope.$watch(function() {
return jqLite(element).attr('multiple');
}, function(newMultiple) {
multiple = newMultiple;
});
Options(scope, element, ngModelCtrl);
}
else if (multiple) Multiple(scope, element, ngModelCtrl);
else Single(scope, element, ngModelCtrl, selectCtrl);

Expand Down
39 changes: 39 additions & 0 deletions test/ng/directive/selectSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,14 @@ describe('select', function() {
}, blank, unknown);
}

function createNgMultiSelect(blank, unknown) {
createSelect({
'ng-model':'selected',
'ng-multiple':'multi',
'ng-options':'value.id as value.name for value in values'
}, blank, unknown);
}


it('should throw when not formated "? for ? in ?"', function() {
expect(function() {
Expand Down Expand Up @@ -1107,6 +1115,37 @@ describe('select', function() {
expect(element.find('option')[1].selected).toBeTruthy();
});

it('should work with ng-multiple and ng-options', function(){
createNgMultiSelect();

scope.$apply(function(){
scope.values = [{name: 'A', id: 'A'}, {name: 'B', id: 'A'}];
scope.selected = [];
scope.multi = false;
});

expect(element.attr('multiple')).toBeFalsy();

scope.$apply(function(){
scope.multi = true;
});

expect(element.attr('multiple')).toBeTruthy();

element.find('option')[0].selected = true;
element.find('option')[1].selected = true;
browserTrigger(element, 'change');

expect(scope.selected.length).toBe(2);

scope.$apply(function(){
scope.selected = ['A'];
});

expect(element.find('option')[0].selected).toBeTruthy();
expect(element.find('option')[1].selected).toBeFalsy();
});


it('should update model on change', function() {
createMultiSelect();
Expand Down