fix(isDisabled) Item not re-enabled when no longer disabled

Jefiozie · user378230 · commit 9d11dd13b343 · 2016-07-30T13:50:49.000+01:00
Causes issue where items could not be re-selected when using remove-selected=true as the item could not be re-enabled once it was deselected. Closes angular-ui#1739
diff --git a/src/uiSelectController.js b/src/uiSelectController.js
@@ -333,7 +333,7 @@ uis.controller('uiSelectCtrl',
     }
 
     if (!isDisabled && disabledItemIndex > -1) {
-      disabledItems.splice(disabledItemIndex, 0);
+      disabledItems.splice(disabledItemIndex, 1);
     }
   }
 
diff --git a/test/select.spec.js b/test/select.spec.js
@@ -1809,6 +1809,7 @@ describe('ui-select tests', function() {
             if (attrs.inputId !== undefined) { attrsHtml += ' input-id="' + attrs.inputId + '"'; }
             if (attrs.groupBy !== undefined) { choicesAttrsHtml += ' group-by="' + attrs.groupBy + '"'; }
             if (attrs.lockChoice !== undefined) { matchesAttrsHtml += ' ui-lock-choice="' + attrs.lockChoice + '"'; }
+            if (attrs.removeSelected !== undefined) { attrsHtml += ' remove-selected="' + attrs.removeSelected + '"'; }
         }
 
         return compileTemplate(
@@ -2743,6 +2744,16 @@ describe('ui-select tests', function() {
       clickItem(el, 'Samantha');
       expect(el.hasClass('ng-not-empty')).toBeTruthy();
     });
+
+    it('should be able to re-select the item with removeselected set to false', function() {
+         scope.selection.selectedMultiple = [scope.people[4], scope.people[5]]; //Wladimir & Samantha
+         var el = createUiSelectMultiple({removeSelected : true});
+         expect(el.scope().$select.selected.length).toBe(2);
+         el.find('.ui-select-match-item').first().find('.ui-select-match-close').click();
+         expect(el.scope().$select.selected.length).toBe(1);
+         clickItem(el, 'Wladimir');
+         expect(el.scope().$select.selected.length).toBe(2);
+     });
   });
 
   it('should add an id to the search input field', function () {

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ uis.controller('uiSelectCtrl',`
`333`	`333`	`}`
`334`	`334`
`335`	`335`	`if (!isDisabled && disabledItemIndex > -1) {`
`336`		`- disabledItems.splice(disabledItemIndex, 0);`
	`336`	`+ disabledItems.splice(disabledItemIndex, 1);`
`337`	`337`	`}`
`338`	`338`	`}`
`339`	`339`