fix(typeahead): do not execute unnecessary $digest

- If in a $digest, do not execute `scope.$digest` Fixes #2652 Closes #3791
angular-ui · Jun 11, 2015 · 0d96221 · 0d96221
1 parent 115d490
commit 0d96221
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/typeahead/typeahead.js b/src/typeahead/typeahead.js
@@ -29,8 +29,8 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.position', 'ui.bootstrap
   };
 }])
 
-  .directive('typeahead', ['$compile', '$parse', '$q', '$timeout', '$document', '$position', 'typeaheadParser',
-    function ($compile, $parse, $q, $timeout, $document, $position, typeaheadParser) {
+  .directive('typeahead', ['$compile', '$parse', '$q', '$timeout', '$document', '$rootScope', '$position', 'typeaheadParser',
+    function ($compile, $parse, $q, $timeout, $document, $rootScope, $position, typeaheadParser) {
 
   var HOT_KEYS = [9, 13, 27, 38, 40];
 
@@ -318,7 +318,9 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.position', 'ui.bootstrap
       var dismissClickHandler = function (evt) {
         if (element[0] !== evt.target) {
           resetMatches();
-          scope.$digest();
+          if (!$rootScope.$$phase) {
+            scope.$digest();
+          }
         }
       };