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

Make $apply first check if $rootScope is in $digest cycle before executing Closes angular-ui#3274
fernando-sendMail · Jul 16, 2015 · 5c8d908 · 5c8d908
1 parent 14ada09
commit 5c8d908
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/dropdown/dropdown.js b/src/dropdown/dropdown.js
@@ -40,11 +40,14 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.position'])
         return;
     }
 
+<<<<<<< HEAD
     var $element = openScope.getElement();
     if( evt && openScope.getAutoClose() === 'outsideClick' && $element && $element[0].contains(evt.target) ) {
       return;
     }
 
+=======
+>>>>>>> fix(dropdown): Fix $digest:inprog on dropdown dismissal
     openScope.isOpen = false;
 
     if (!$rootScope.$$phase) {

diff --git a/src/dropdown/test/dropdown.spec.js b/src/dropdown/test/dropdown.spec.js
@@ -180,6 +180,7 @@ describe('dropdownToggle', function() {
 
       expect(element.hasClass('open')).toBe(false);
     });
+<<<<<<< HEAD
   });
 
   describe('using dropdown-append-to-body', function() {
@@ -200,6 +201,8 @@ describe('dropdownToggle', function() {
       $rootScope.$digest();
       expect($document.find('#dropdown-menu').length).toEqual(0);
     });
+=======
+>>>>>>> fix(dropdown): Fix $digest:inprog on dropdown dismissal
   });
 
   describe('integration with $location URL rewriting', function() {