fix: typeahead $apply already in progress

see: angular-ui/bootstrap#2652
koox00 · Jan 10, 2017 · 18dd4ad · 18dd4ad
1 parent f48b012
commit 18dd4ad
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/typeahead/typeahead.js b/src/typeahead/typeahead.js
@@ -29,8 +29,8 @@ angular.module('mm.foundation.typeahead', ['mm.foundation.position', 'mm.foundat
   };
 }])
 
-  .directive('typeahead', ['$compile', '$parse', '$q', '$timeout', '$document', '$position', 'typeaheadParser',
-    function ($compile, $parse, $q, $timeout, $document, $position, typeaheadParser) {
+  .directive('typeahead', ['$compile', '$parse', '$q', '$timeout', '$document', '$position', 'typeaheadParser', '$rootScope',
+    function ($compile, $parse, $q, $timeout, $document, $position, typeaheadParser, $rootScope) {
 
   var HOT_KEYS = [9, 13, 27, 38, 40];
 
@@ -273,7 +273,10 @@ angular.module('mm.foundation.typeahead', ['mm.foundation.position', 'mm.foundat
       var dismissClickHandler = function (evt) {
         if (element[0] !== evt.target) {
           resetMatches();
-          scope.$digest();
+
+          if (!$rootScope.$$phase) {
+            scope.$digest();
+          }
         }
       };