Merge pull request angular-ui#88 from bdecarne/patch-1

ProLoser · ProLoser · commit fd5c3d6b83bc · 2013-11-22T11:49:16.000-08:00
check scope.$root.$$phase before $apply
diff --git a/src/select2.js b/src/select2.js
@@ -143,7 +143,7 @@ angular.module('ui.select2', []).value('uiSelect2Config', {}).directive('uiSelec
           if (!isSelect) {
             // Set the view and model value and update the angular template manually for the ajax/multiple select2.
             elm.bind("change", function () {
-              if (scope.$$phase) {
+              if (scope.$$phase || scope.$root.$$phase) {
                 return;
               }
               scope.$apply(function () {

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ angular.module('ui.select2', []).value('uiSelect2Config', {}).directive('uiSelec`
`143`	`143`	`if (!isSelect) {`
`144`	`144`	`// Set the view and model value and update the angular template manually for the ajax/multiple select2.`
`145`	`145`	`elm.bind("change", function () {`
`146`		`- if (scope.$$phase) {`
	`146`	`+ if (scope.$$phase \|\| scope.$root.$$phase) {`
`147`	`147`	`return;`
`148`	`148`	`}`
`149`	`149`	`scope.$apply(function () {`