merge(spec): merging conflicts

Signed-off-by: Josh Kurz <jkurz25@gmail.com>

Author: joshkurz

src/calendar.js

@@ -11,32 +11,27 @@
 angular.module('ui.calendar', [])
   .constant('uiCalendarConfig', {calendars: {}})
   .controller('uiCalendarCtrl', ['$scope', 
-                                 '$timeout', 
                                  '$locale', function(
                                   $scope, 
-                                  $timeout, 
                                   $locale){
 
       var sources = $scope.eventSources,
           extraEventSignature = $scope.calendarWatchEvent ? $scope.calendarWatchEvent : angular.noop,
 
           wrapFunctionWithScopeApply = function(functionToWrap){
-              var wrapper;
-
-              if (functionToWrap){
-                  wrapper = function(){
-                      // This happens outside of angular context so we need to wrap it in a timeout which has an implied apply.
-                      // In this way the function will be safely executed on the next digest.
+              return function(){
+                  // This may happen outside of angular context, so create one if outside.
 
+                  if ($scope.$root.$$phase) {
+                      return functionToWrap.apply(this, arguments);
+                  } else {
                       var args = arguments;
-                      var _this = this;
-                      $timeout(function(){
-                        functionToWrap.apply(_this, args);
+                      var self = this;
+                      return $scope.$root.$apply(function(){
+                          return functionToWrap.apply(self, args);
                       });
-                  };
-              }
-
-              return wrapper;
+                  }
+              };
           };
 
       var eventSerialId = 1;

test/calendar.spec.js

@@ -366,72 +366,40 @@ describe('uiCalendar', function () {
           scope.$apply();
         });
 
-        it('should make sure that all config functions are called in an angular context', inject(function($timeout, $rootScope){
-          var functionCount = 0;
-          scope.uiConfig = {
-            calendar:{
-              height: 200,
-              weekends: false,
-              defaultView: 'month',
-              dayClick: function(){},
-              eventClick: function(){},
-              eventDrop: function(){},
-              eventResize: function(){},
-              eventMouseover: function(){}
-            }
-          };
-
-          spyOn($rootScope,'$apply');
-
-          angular.forEach(scope.uiConfig.calendar, function(value,key){
-            if (typeof value === 'function'){
-              functionCount++;
-              spyOn(scope.uiConfig.calendar, key);
+        it('should make sure that all config functions are called in an angular context', inject(function($rootScope){
+            scope.uiConfig = {
+                calendar:{
+                    height: 200,
+                    weekends: false,
+                    defaultView: 'month'
+                }
+            };
 
-              var fullCalendarConfig = calendarCtrl.getFullCalendarConfig(scope.uiConfig.calendar, {});
+            var keys = ['dayClick', 'eventClick', 'eventDrop', 'eventResize', 'eventMouseover'];
+            angular.forEach(keys, function(key) {
+                scope.uiConfig.calendar[key] = jasmine.createSpy().andReturn(key);
+            });
 
-              fullCalendarConfig[key]();
-              $timeout.flush();
-              expect($rootScope.$apply.callCount).toBe(functionCount);
-              expect(scope.uiConfig.calendar[key]).toHaveBeenCalled();
-              $rootScope.$apply.isSpy = false;
-            }
-          });
-        }));
+            var fullCalendarConfig = calendarCtrl.getFullCalendarConfig(scope.uiConfig.calendar, {});
 
-        it('should check that any function that already has an apply in it does not break the calendar (backwards compatible)', inject(function($timeout, $rootScope){
-
-          var functionCount = 0;
-          scope.uiConfig = {
-            calendar:{
-              height: 200,
-              weekends: false,
-              defaultView: 'month',
-              dayClick: function(){scope.$apply();},
-              eventClick: function(){scope.$apply();},
-              eventDrop: function(){scope.$apply();},
-              eventResize: function(){scope.$apply();},
-              eventMouseover: function(){scope.$apply();}
-            }
-          };
+            spyOn($rootScope,'$apply').andCallThrough();
 
-          spyOn($rootScope,'$apply');
+            angular.forEach(keys, function(key){
+                $rootScope.$apply.reset();
 
-          angular.forEach(scope.uiConfig.calendar, function(value,key){
-            if (typeof value === 'function'){
-              functionCount++;
-              spyOn(scope.uiConfig.calendar, key);
+                var fn = fullCalendarConfig[key];
 
-              var fullCalendarConfig = calendarCtrl.getFullCalendarConfig(scope.uiConfig.calendar, {});
+                expect(fn()).toBe(key);
+                expect($rootScope.$apply.callCount).toBe(1);
+                expect(scope.uiConfig.calendar[key].callCount).toBe(1);
 
-              fullCalendarConfig[key]();
-              
-              scope.$apply();
-              $timeout.flush();
-              expect($rootScope.$apply.callCount).toBe(functionCount*2);
-              expect(scope.uiConfig.calendar[key]).toHaveBeenCalled();
-            }
-          });
+                expect($rootScope.$apply(function(){
+                    expect($rootScope.$apply.callCount).toBe(2);
+                    return fn();
+                })).toBe(key);
+                expect($rootScope.$apply.callCount).toBe(2);
+                expect(scope.uiConfig.calendar[key].callCount).toBe(2);
+            });
         }));
     });