fix(dropdown): Fix $digest:inprog on dismissal without using $timeout

Signed-off-by: Max Fierke <[email protected]>

src/dropdown/dropdown.js

@@ -4,7 +4,7 @@ angular.module('ui.bootstrap.dropdown', [])
   openClass: 'open'
 })
 
-.service('dropdownService', ['$document', '$timeout', function($document, $timeout) {
+.service('dropdownService', ['$document', function($document) {
   var openScope = null;
 
   this.open = function( dropdownScope ) {
@@ -38,9 +38,13 @@ angular.module('ui.bootstrap.dropdown', [])
         return;
     }
 
-    $timeout(function() {
+    if (!openScope.$$phase) {
+      openScope.$apply(function() {
+        openScope.isOpen = false;
+      });
+    } else {
       openScope.isOpen = false;
-    });
+    }
   };
 
   var escapeKeyBind = function( evt ) {

src/dropdown/test/dropdown.spec.js

@@ -1,33 +1,23 @@
 describe('dropdownToggle', function() {
-  var $compile, $rootScope, $document, $timeout, element;
+  var $compile, $rootScope, $document, element;
 
   beforeEach(module('ui.bootstrap.dropdown'));
 
-  beforeEach(inject(function(_$compile_, _$rootScope_, _$document_, _$timeout_) {
+  beforeEach(inject(function(_$compile_, _$rootScope_, _$document_) {
     $compile = _$compile_;
     $rootScope = _$rootScope_;
     $document = _$document_;
-    $timeout = _$timeout_;
   }));
 
-  var processTimeout = function () {
-    try {
-      $timeout.flush();
-    } catch (e) {}
-    $rootScope.$digest();
-  };
-
   var clickDropdownToggle = function(elm) {
     elm = elm || element;
     elm.find('a[dropdown-toggle]').click();
-    processTimeout();
   };
 
   var triggerKeyDown = function (element, keyCode) {
     var e = $.Event('keydown');
     e.which = keyCode;
     element.trigger(e);
-    processTimeout();
   };
 
   var isFocused = function(elm) {
@@ -59,7 +49,6 @@ describe('dropdownToggle', function() {
 
       var optionEl = element.find('ul > li').eq(0).find('a').eq(0);
       optionEl.click();
-      processTimeout();
       expect(element.hasClass('open')).toBe(false);
       element.remove();
     });
@@ -68,7 +57,6 @@ describe('dropdownToggle', function() {
       clickDropdownToggle();
       expect(element.hasClass('open')).toBe(true);
       $document.click();
-      processTimeout();
       expect(element.hasClass('open')).toBe(false);
     });