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 · 30735ea · 30735ea
1 parent d1c6f48
commit 30735ea
Show file tree

Hide file tree

Showing 2 changed files with 18 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 ) {

diff --git a/src/dropdown/test/dropdown.spec.js b/src/dropdown/test/dropdown.spec.js
@@ -166,6 +166,18 @@ describe('dropdownToggle', function() {
  clickDropdownToggle();
  expect(toggleEl.attr('aria-expanded')).toBe('false');
  });
+
+ // pr/issue 3274
+ it('should not raise $digest:inprog if dismissed during a digest cycle', function () {
+ clickDropdownToggle();
+ expect(element.hasClass('open')).toBe(true);
+
+ $rootScope.$apply(function () {
+ $document.click();
+ });
+
+ expect(element.hasClass('open')).toBe(false);
+ });
  });
 
  describe('integration with $location URL rewriting', function() {