fix(calendar): not hacking the accessibility of mulitple calendars

Signed-off-by: Josh Kurz <josh.kurz@turner.com>

Author: jkurz

bower.json

@@ -16,12 +16,17 @@
     "package.json"
   ],
   "dependencies": {
-    "angular": "~1.2.x",
-    "fullcalendar": "~2.x"
+    "angular": "1.2.26",
+    "jquery": "2.x",
+    "fullcalendar": "2.1.1",
+    "moment": "2.*"
   },
   "devDependencies": {
     "angular-mocks": "~1.x",
-    "bootstrap-css": "2.3.1",
-    "jquery-ui": "~1.10.3"
+    "bootstrap-css": "2.3.1"
+  },
+  "resolutions": {
+    "jquery": "~2.x",
+    "angular": "1.2.26"
   }
 }

src/calendar.js

@@ -9,8 +9,13 @@
 */
 
 angular.module('ui.calendar', [])
-  .constant('uiCalendarConfig', {})
-  .controller('uiCalendarCtrl', ['$scope', '$timeout', '$locale', function($scope, $timeout, $locale){
+  .constant('uiCalendarConfig', {calendars: {}})
+  .controller('uiCalendarCtrl', ['$scope', 
+                                 '$timeout', 
+                                 '$locale', function(
+                                  $scope, 
+                                  $timeout, 
+                                  $locale){
 
       var sourceSerialId = 1,
           eventSerialId = 1,
@@ -198,6 +203,7 @@ angular.module('ui.calendar', [])
 
         var sources = scope.eventSources,
             sourcesChanged = false,
+            calendar,
             eventSourcesWatcher = controller.changeWatcher(sources, controller.sourcesFingerprint),
             eventsWatcher = controller.changeWatcher(controller.allEvents, controller.eventsFingerprint),
             options = null;
@@ -210,9 +216,10 @@ angular.module('ui.calendar', [])
 
           var localeFullCalendarConfig = controller.getLocaleConfig(fullCalendarConfig);
           angular.extend(localeFullCalendarConfig, fullCalendarConfig);
-
           options = { eventSources: sources };
           angular.extend(options, localeFullCalendarConfig);
+          //remove calendars from options
+          options.calendars = null;
 
           var options2 = {};
           for(var o in options){
@@ -224,44 +231,44 @@ angular.module('ui.calendar', [])
         }
 
         scope.destroy = function(){
-          if(scope.calendar && scope.calendar.fullCalendar){
-            scope.calendar.fullCalendar('destroy');
+          if(calendar && calendar.fullCalendar){
+            calendar.fullCalendar('destroy');
           }
           if(attrs.calendar) {
-            scope.calendar = scope.$parent[attrs.calendar] =  $(elm).html('');
+            calendar = uiCalendarConfig.calendars[attrs.calendar] = $(elm).html('');
           } else {
-            scope.calendar = $(elm).html('');
+            calendar = $(elm).html('');
           }
         };
 
         scope.init = function(){
-          scope.calendar.fullCalendar(options);
+          calendar.fullCalendar(options);
         };
 
         eventSourcesWatcher.onAdded = function(source) {
-            scope.calendar.fullCalendar('addEventSource', source);
+            calendar.fullCalendar('addEventSource', source);
             sourcesChanged = true;
         };
 
         eventSourcesWatcher.onRemoved = function(source) {
-          scope.calendar.fullCalendar('removeEventSource', source);
+          calendar.fullCalendar('removeEventSource', source);
           sourcesChanged = true;
         };
 
         eventsWatcher.onAdded = function(event) {
-          scope.calendar.fullCalendar('renderEvent', event);
+          calendar.fullCalendar('renderEvent', event);
         };
 
         eventsWatcher.onRemoved = function(event) {
-          scope.calendar.fullCalendar('removeEvents', function(e) { 
+          calendar.fullCalendar('removeEvents', function(e) { 
             return e._id === event._id;
           });
         };
 
         eventsWatcher.onChanged = function(event) {
           event._start = $.fullCalendar.moment(event.start);
           event._end = $.fullCalendar.moment(event.end);
-          scope.calendar.fullCalendar('updateEvent', event);
+          calendar.fullCalendar('updateEvent', event);
         };
 
         eventSourcesWatcher.subscribe(scope);

test/calendar.spec.js

@@ -2,7 +2,7 @@
 describe('uiCalendar', function () {
     'use strict';
 
-    var scope, $compile, $locale, $controller;
+    var scope, $compile, $locale, $controller, config;
 
     //Date Objects needed for event
     var date = new Date();
@@ -11,11 +11,12 @@ describe('uiCalendar', function () {
     var y = date.getFullYear();
 
     beforeEach(module('ui.calendar'));
-    beforeEach(inject(function (_$rootScope_, _$compile_, _$locale_,_$controller_) {
+    beforeEach(inject(function (_$rootScope_, _$compile_, _$locale_,_$controller_,uiCalendarConfig) {
         scope = _$rootScope_.$new();
         $compile = _$compile_;
         $locale = _$locale_;
         $controller = _$controller_;
+        config = uiCalendarConfig;
 
         // create an array of events, to pass into the directive. 
         scope.events = [
@@ -293,17 +294,17 @@ describe('uiCalendar', function () {
         });
     });
 
-    describe('Testing the ability to add calendars to the scope', function(){
+    describe('Testing the ability to add calendars to the calendarConfig', function(){
 
          beforeEach(function(){
             spyOn($.fn, 'fullCalendar');
-            expect(scope.myCalendar).toBe(undefined);
+            expect(config.calendars.myCalendar).toBe(undefined);
             $compile('<div ui-calendar="uiConfig.calendar" calendar="myCalendar" ng-model="eventSources"></div>')(scope);
             scope.$apply();
          });
 
-         it('should make sure the calendar sets the myCalendar object to the defining scope', function () {
-            expect(scope.myCalendar).not.toBe(undefined);
+         it('should make sure the calendar sets the myCalendar object to the calendarConfig', function () {
+            expect(config.calendars.myCalendar).not.toBe(undefined);
          });
     });