fix(dropdown): Fix $digest:inprog on dropdown dismissal

Could occur when click event handled during digest cycle (through another directive, etc.) Signed-off-by: Max Fierke <[email protected]>
angular-ui · Mar 24, 2015 · fc86a87 · fc86a87
1 parent 13bd516
commit fc86a87
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/dropdown/dropdown.js b/src/dropdown/dropdown.js
@@ -4,7 +4,7 @@ angular.module('ui.bootstrap.dropdown', [])
   openClass: 'open'
 })
 
-.service('dropdownService', ['$document', function($document) {
+.service('dropdownService', ['$document', '$rootScope', function($document, $rootScope) {
   var openScope = null;
 
   this.open = function( dropdownScope ) {
@@ -38,9 +38,11 @@ angular.module('ui.bootstrap.dropdown', [])
         return;
     }
 
-    openScope.$apply(function() {
-      openScope.isOpen = false;
-    });
+    openScope.isOpen = false;
+
+    if (!$rootScope.$$phase) {
+      openScope.$apply();
+    }
   };
 
   var escapeKeyBind = function( evt ) {