feat(v2): upgrade calendar to v2

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

Author: jkurz

bower.json

@@ -17,7 +17,8 @@
   ],
   "dependencies": {
     "angular": "~1.2.x",
-    "jquery": "~2.x",
+    "moment": "2.5.1",
+    "jquery": "~1.10.2",
     "jquery-ui": "~1.10.3",
     "fullcalendar": "~1.x"
   },

demo/calendarDemo.js

@@ -26,7 +26,7 @@ function CalendarCtrl($scope) {
       {title: 'Click for Google',start: new Date(y, m, 28),end: new Date(y, m, 29),url: 'http://google.com/'}
     ];
     /* event source that calls a function on every view switch */
-    $scope.eventsF = function (start, end, callback) {
+    $scope.eventsF = function (start, end, timezone, callback) {
       var s = new Date(start).getTime() / 1000;
       var e = new Date(end).getTime() / 1000;
       var m = new Date(start).getMonth();
@@ -48,12 +48,12 @@ function CalendarCtrl($scope) {
         $scope.alertMessage = (event.title + ' was clicked ');
     };
     /* alert on Drop */
-     $scope.alertOnDrop = function(event, dayDelta, minuteDelta, allDay, revertFunc, jsEvent, ui, view){
-       $scope.alertMessage = ('Event Droped to make dayDelta ' + dayDelta);
+     $scope.alertOnDrop = function( event, revertFunc, jsEvent, ui, view){
+       $scope.alertMessage = ('Event Droped on ' + event.start.format());
     };
     /* alert on Resize */
-    $scope.alertOnResize = function(event, dayDelta, minuteDelta, revertFunc, jsEvent, ui, view ){
-       $scope.alertMessage = ('Event Resized to make dayDelta ' + minuteDelta);
+    $scope.alertOnResize = function( event, jsEvent, ui, view){
+       $scope.alertMessage = ('Event end date was moved to ' + event.end.format());
     };
     /* add and removes an event source of choice */
     $scope.addRemoveEventSource = function(sources,source) {

demo/index.html

@@ -9,6 +9,7 @@
 
     <script src="../bower_components/jquery/dist/jquery.js"></script>
     <script src="../bower_components/jquery-ui/ui/jquery-ui.js"></script>
+    <script src="../bower_components/moment/moment.js"></script>
 
     <script src="../bower_components/angular/angular.js"></script>
     <script src="http://angular-ui.github.io/bootstrap/ui-bootstrap-tpls-0.9.0.js"></script>

src/calendar.js

@@ -215,6 +215,9 @@ angular.module('ui.calendar', [])
         }
 
         scope.destroy = function(){
+          if(scope.calendar && scope.calendar.fullCalendar){
+            scope.calendar.fullCalendar('destroy');
+          }
           if(attrs.calendar) {
             scope.calendar = scope.$parent[attrs.calendar] =  elm.html('');
           } else {
@@ -227,8 +230,10 @@ angular.module('ui.calendar', [])
         };
 
         eventSourcesWatcher.onAdded = function(source) {
-          scope.calendar.fullCalendar('addEventSource', source);
-          sourcesChanged = true;
+          if(elm.is(':visible')){
+            scope.calendar.fullCalendar('addEventSource', source);
+            sourcesChanged = true;
+          }
         };
 
         eventSourcesWatcher.onRemoved = function(source) {
@@ -241,7 +246,9 @@ angular.module('ui.calendar', [])
         };
 
         eventsWatcher.onRemoved = function(event) {
-          scope.calendar.fullCalendar('removeEvents', function(e) { return e === event; });
+          scope.calendar.fullCalendar('removeEvents', function(e) { 
+            return e.__uiCalId === event.__uiCalId; 
+          });
         };
 
         eventsWatcher.onChanged = function(event) {

test/test.conf.js

@@ -7,6 +7,7 @@ module.exports = function (config) {
         'bower_components/jquery-ui/ui/*.js',
         'bower_components/angular/angular.js',
         'bower_components/angular-mocks/angular-mocks.js',
+        'bower_components/moment/moment.js',
         'bower_components/fullcalendar/fullcalendar.js',
         'src/calendar.js',
         'test/*.spec.js'