fix issue-angular-ui#1686: bug reset selected options

jc-vogel · jc-vogel · commit b5599dd8b969 · 2016-06-24T16:28:44.000+02:00
diff --git a/src/uiSelectMultipleDirective.js b/src/uiSelectMultipleDirective.js
@@ -154,6 +154,7 @@ uis.directive('uiSelectMultiple', ['uiSelectMinErr','$timeout', function(uiSelec
       });
 
       ngModel.$render = function() {
+        $select.selected = ngModel.$viewValue;
         // Make sure that model value is array
         if(!angular.isArray(ngModel.$viewValue)){
           // Have tolerance for null or undefined values
@@ -163,7 +164,6 @@ uis.directive('uiSelectMultiple', ['uiSelectMinErr','$timeout', function(uiSelec
             throw uiSelectMinErr('multiarr', "Expected model value to be array but got '{0}'", ngModel.$viewValue);
           }
         }
-        $select.selected = ngModel.$viewValue;
         $selectMultiple.refreshComponent();
         scope.$evalAsync(); //To force $digest
       };

Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,7 @@ uis.directive('uiSelectMultiple', ['uiSelectMinErr','$timeout', function(uiSelec`
`154`	`154`	`});`
`155`	`155`
`156`	`156`	`ngModel.$render = function() {`
	`157`	`+ $select.selected = ngModel.$viewValue;`
`157`	`158`	`// Make sure that model value is array`
`158`	`159`	`if(!angular.isArray(ngModel.$viewValue)){`
`159`	`160`	`// Have tolerance for null or undefined values`
`@@ -163,7 +164,6 @@ uis.directive('uiSelectMultiple', ['uiSelectMinErr','$timeout', function(uiSelec`
`163`	`164`	`throw uiSelectMinErr('multiarr', "Expected model value to be array but got '{0}'", ngModel.$viewValue);`
`164`	`165`	`}`
`165`	`166`	`}`
`166`		`- $select.selected = ngModel.$viewValue;`
`167`	`167`	`$selectMultiple.refreshComponent();`
`168`	`168`	`scope.$evalAsync(); //To force $digest`
`169`	`169`	`};`