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

fix(select): manage select controller options correctly #9421

Closed
wants to merge 1 commit into from
Closed

fix(select): manage select controller options correctly #9421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 18 additions & 3 deletions src/ng/directive/select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {
// Workaround for https://code.google.com/p/chromium/issues/detail?id=381459
// Adding an <option selected="selected"> element to a <select required="required"> should
// automatically select the new element
if (element[0].hasAttribute('selected')) {
if (element && element[0].hasAttribute('selected')) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this change related?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, nvm, i get it.

element[0].selected = true;
}
};
Expand Down Expand Up @@ -501,6 +501,11 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {
}
}

function updateLabelMap(labelMap, label, added) {
labelMap[label] = labelMap[label] || 0;
labelMap[label] += (added ? 1 : -1);
}

function render() {
renderScheduled = false;

Expand All @@ -518,6 +523,7 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {
value,
groupLength, length,
groupIndex, index,
labelMap = {},
selected,
isSelected = createIsSelectedFn(viewValue),
anySelected = false,
Expand Down Expand Up @@ -600,6 +606,8 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {
// reuse elements
lastElement = existingOption.element;
if (existingOption.label !== option.label) {
updateLabelMap(labelMap, existingOption.label, false);
updateLabelMap(labelMap, option.label, true);
lastElement.text(existingOption.label = option.label);
}
if (existingOption.id !== option.id) {
Expand Down Expand Up @@ -639,7 +647,7 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {
id: option.id,
selected: option.selected
});
selectCtrl.addOption(option.label, element);
updateLabelMap(labelMap, option.label, true);
if (lastElement) {
lastElement.after(element);
} else {
Expand All @@ -652,9 +660,16 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {
index++; // increment since the existingOptions[0] is parent element not OPTION
while(existingOptions.length > index) {
option = existingOptions.pop();
selectCtrl.removeOption(option.label);
updateLabelMap(labelMap, option.label, false);
option.element.remove();
}
forEach(labelMap, function (count, label) {
if (count > 0) {
selectCtrl.addOption(label);
} else if (count < 0) {
selectCtrl.removeOption(label);
}
});
}
// remove any excessive OPTGROUPs from select
while(optionGroupsCache.length > groupIndex) {
Expand Down
84 changes: 70 additions & 14 deletions test/ng/directive/selectSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,31 +407,59 @@ describe('select', function() {
});

describe('selectController.hasOption', function() {
it('should return true for options added via ngOptions', function() {
it('should return false for options shifted via ngOptions', function() {
scope.robots = [
{key: 1, value: 'c3p0'},
{key: 2, value: 'r2d2'}
{value: 1, label: 'c3p0'},
{value: 2, label: 'r2d2'}
];
scope.robot = 'r2d2';

compile('<select ng-model="robot" ' +
'ng-options="item.key as item.value for item in robots">' +
'ng-options="item.value as item.label for item in robots">' +
'</select>');

var selectCtrl = element.data().$selectController;

expect(selectCtrl.hasOption('c3p0')).toBe(true);
scope.$apply(function() {
scope.robots.shift();
});

expect(selectCtrl.hasOption('c3p0')).toBe(false);
expect(selectCtrl.hasOption('r2d2')).toBe(true);
});

it('should return false for options popped via ngOptions', function() {
scope.robots = [
{value: 1, label: 'c3p0'},
{value: 2, label: 'r2d2'}
];

compile('<select ng-model="robot" ' +
'ng-options="item.value as item.label for item in robots">' +
'</select>');

var selectCtrl = element.data().$selectController;

scope.$apply(function() {
scope.robots.pop();
});

expect(selectCtrl.hasOption('c3p0')).toBe(true);
expect(selectCtrl.hasOption('r2d2')).toBe(false);
});

it('should return true for options added via ngOptions', function() {
scope.robots = [
{value: 2, label: 'r2d2'}
];

compile('<select ng-model="robot" ' +
'ng-options="item.value as item.label for item in robots">' +
'</select>');

var selectCtrl = element.data().$selectController;

scope.$apply(function() {
scope.robots.push({key: 2, value: 'r2d2'});
scope.robots.unshift({value: 1, label: 'c3p0'});
});

expect(selectCtrl.hasOption('c3p0')).toBe(true);
Expand Down Expand Up @@ -516,31 +544,59 @@ describe('select', function() {
});

describe('selectController.hasOption', function() {
it('should return true for options added via ngOptions', function() {
it('should return false for options shifted via ngOptions', function() {
scope.robots = [
{key: 1, value: 'c3p0'},
{key: 2, value: 'r2d2'}
{value: 1, label: 'c3p0'},
{value: 2, label: 'r2d2'}
];
scope.robot = 'r2d2';

compile('<select ng-model="robot" multiple ' +
'ng-options="item.key as item.value for item in robots">' +
'ng-options="item.value as item.label for item in robots">' +
'</select>');

var selectCtrl = element.data().$selectController;

expect(selectCtrl.hasOption('c3p0')).toBe(true);
scope.$apply(function() {
scope.robots.shift();
});

expect(selectCtrl.hasOption('c3p0')).toBe(false);
expect(selectCtrl.hasOption('r2d2')).toBe(true);
});

it('should return false for options popped via ngOptions', function() {
scope.robots = [
{value: 1, label: 'c3p0'},
{value: 2, label: 'r2d2'}
];

compile('<select ng-model="robot" multiple ' +
'ng-options="item.value as item.label for item in robots">' +
'</select>');

var selectCtrl = element.data().$selectController;

scope.$apply(function() {
scope.robots.pop();
});

expect(selectCtrl.hasOption('c3p0')).toBe(true);
expect(selectCtrl.hasOption('r2d2')).toBe(false);
});

it('should return true for options added via ngOptions', function() {
scope.robots = [
{value: 2, label: 'r2d2'}
];

compile('<select ng-model="robot" multiple ' +
'ng-options="item.value as item.label for item in robots">' +
'</select>');

var selectCtrl = element.data().$selectController;

scope.$apply(function() {
scope.robots.push({key: 2, value: 'r2d2'});
scope.robots.unshift({value: 1, label: 'c3p0'});
});

expect(selectCtrl.hasOption('c3p0')).toBe(true);
Expand Down