From 6f88e344aed0578ba37fae57a4fbf0c136c18105 Mon Sep 17 00:00:00 2001 From: Lucas Thielmann Date: Mon, 6 Jun 2016 18:02:13 +0200 Subject: [PATCH 1/2] Update uiSelectMultipleDirective.js --- src/uiSelectMultipleDirective.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/uiSelectMultipleDirective.js b/src/uiSelectMultipleDirective.js index e8ce8a7e5..ef1b4a0d8 100644 --- a/src/uiSelectMultipleDirective.js +++ b/src/uiSelectMultipleDirective.js @@ -36,7 +36,7 @@ uis.directive('uiSelectMultiple', ['uiSelectMinErr','$timeout', function(uiSelec var removedChoice = $select.selected[index]; // if the choice is locked, can't remove it - if(removedChoice._uiSelectChoiceLocked) return; + if(removedChoice.$uiSelectChoiceLocked) return; var locals = {}; locals[$select.parserResult.itemName] = removedChoice; From d0c5b275723e4a408a3829de79a2e4a96fb2778e Mon Sep 17 00:00:00 2001 From: Lucas Thielmann Date: Mon, 6 Jun 2016 18:04:33 +0200 Subject: [PATCH 2/2] Update uiSelectController.js --- src/uiSelectController.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/uiSelectController.js b/src/uiSelectController.js index 11d23dfc2..6efb98ba9 100644 --- a/src/uiSelectController.js +++ b/src/uiSelectController.js @@ -335,7 +335,7 @@ uis.controller('uiSelectCtrl', if (itemIndex >= 0 && (!angular.isUndefined(ctrl.disableChoiceExpression) || ctrl.multiple)) { item = ctrl.items[itemIndex]; isDisabled = !!(itemScope.$eval(ctrl.disableChoiceExpression)) || _isItemSelected(item); // force the boolean value - item._uiSelectChoiceDisabled = isDisabled; // store this for later reference + item.$uiSelectChoiceDisabled = isDisabled; // store this for later reference } return isDisabled; @@ -344,11 +344,11 @@ uis.controller('uiSelectCtrl', // When the user selects an item with ENTER or clicks the dropdown ctrl.select = function(item, skipFocusser, $event) { - if (item === undefined || !item._uiSelectChoiceDisabled) { + if (item === undefined || !item.$uiSelectChoiceDisabled) { if ( ! ctrl.items && ! ctrl.search && ! ctrl.tagging.isActivated) return; - if (!item || !item._uiSelectChoiceDisabled) { + if (!item || !item.$uiSelectChoiceDisabled) { if(ctrl.tagging.isActivated) { // if taggingLabel is disabled, we pull from ctrl.search val if ( ctrl.taggingLabel === false ) { @@ -449,7 +449,7 @@ uis.controller('uiSelectCtrl', if (item && !angular.isUndefined(ctrl.lockChoiceExpression)) { isLocked = !!(itemScope.$eval(ctrl.lockChoiceExpression)); // force the boolean value - item._uiSelectChoiceLocked = isLocked; // store this for later reference + item.$uiSelectChoiceLocked = isLocked; // store this for later reference } return isLocked;