Skip to content
This repository was archived by the owner on Oct 2, 2019. It is now read-only.

fix(uiSelectMultipleDirective): Fixes checks for existing tags during multiple tag creation and selection #1473

Merged
merged 1 commit into from
Mar 4, 2016
Merged

fix(uiSelectMultipleDirective): Fixes checks for existing tags during multiple tag creation and selection #1473

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
6 changes: 5 additions & 1 deletion src/uiSelectController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,11 @@ uis.controller('uiSelectCtrl',
ctrl.setItemsFn(data);
}else{
if ( data !== undefined ) {
var filteredItems = data.filter(function(i) {return selectedItems && selectedItems.indexOf(i) < 0;});
var filteredItems = data.filter(function(i) {
return selectedItems.every(function(selectedItem) {
return !angular.equals(i, selectedItem);
});
});
ctrl.setItemsFn(filteredItems);
}
}
Expand Down
16 changes: 13 additions & 3 deletions src/uiSelectMultipleDirective.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,9 +299,19 @@ uis.directive('uiSelectMultiple', ['uiSelectMinErr','$timeout', function(uiSelec
stashArr = stashArr.slice(1,stashArr.length);
}
newItem = $select.tagging.fct($select.search);
newItem.isTag = true;
// verify the the tag doesn't match the value of an existing item
if ( stashArr.filter( function (origItem) { return angular.equals( origItem, $select.tagging.fct($select.search) ); } ).length > 0 ) {
// verify the new tag doesn't match the value of a possible selection choice or an already selected item.
if (
stashArr.some(function (origItem) {
return angular.equals(origItem, $select.tagging.fct($select.search));
Copy link
Contributor

Choose a reason for hiding this comment

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

Was there any hidden reason for choosing

return angular.equals(origItem, $select.tagging.fct($select.search));

in this line, and not the same as below

return angular.equals(origItem, newItem);

}) ||
$select.selected.some(function (origItem) {
return angular.equals(origItem, newItem);
})
) {
scope.$evalAsync(function () {
$select.activeIndex = 0;
$select.items = items;
});
return;
}
newItem.isTag = true;
Expand Down