fix(calendar.js): do not alter original execution context angular-ui#107

angular-ui#87 angular-ui#105 Signed-off-by: joshkurz <[email protected]>
joshkurz · May 12, 2014 · be423a3 · be423a3
1 parent d6550d1
commit be423a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/calendar.js b/src/calendar.js
@@ -26,9 +26,8 @@ angular.module('ui.calendar', [])
                       // In this way the function will be safely executed on the next digest.
 
                       var args = arguments;
-                      $timeout(function(){
-                          functionToWrap.apply(this, args);
-                      });
+                      functionToWrap.apply(this, args);
+                      $scope.$apply();
                   };
               }
 

diff --git a/test/calendar.spec.js b/test/calendar.spec.js
@@ -376,8 +376,6 @@ describe('uiCalendar', function () {
 
               fullCalendarConfig[key]();
 
-              $timeout.flush();
-
               expect($rootScope.$apply.callCount).toBe(functionCount);
               expect(scope.uiConfig.calendar[key]).toHaveBeenCalled();
               $rootScope.$apply.isSpy = false;
@@ -413,7 +411,6 @@ describe('uiCalendar', function () {
               fullCalendarConfig[key]();
 
               scope.$apply();
-              $timeout.flush();
 
               expect($rootScope.$apply.callCount).toBe(functionCount*2);
               expect(scope.uiConfig.calendar[key]).toHaveBeenCalled();