Просмотр исходного кода

eventAfterAllRender -> _eventsRendered

Adam Shaw 7 лет назад
Родитель
Сommit
8a26c86097

+ 1 - 2
src/component/DateComponent.ts

@@ -608,10 +608,9 @@ export default abstract class DateComponent extends Component {
         this.eventRangesToSegs(eventRanges)
       )
 
-      // hack to fire eventAfterAllRender
       let calendar = this.getCalendar()
       if (!calendar.state.loadingLevel) { // avoid initial empty state while pending
-        calendar.afterSizingTriggers.eventAfterAllRender = [ null ] // fire once
+        calendar.afterSizingTriggers._eventsRendered = [ null ] // fire once
       }
     }
   }

+ 5 - 0
src/types/input-types.ts

@@ -186,8 +186,13 @@ export interface OptionsInputBase {
   eventDataTransform?(eventData: any): EventInput
   loading?(isLoading: boolean, view: View): void
   eventRender?(arg: { event: EventApi, el: HTMLElement, view: View }): void
+<<<<<<< HEAD
   eventRendered?(arg: { event: EventApi, el: HTMLElement, view: View }): void
   eventAfterAllRender?(arg: { view: View }): void
+=======
+  eventPositioned?(arg: { event: EventApi, el: HTMLElement, view: View }): void
+  _eventsRendered?(arg: { view: View }): void
+>>>>>>> 560e67db... eventAfterAllRender -> _eventsRendered
   eventDestroy?(arg: { event: EventApi, el: HTMLElement, view: View }): void
   eventDragStart?(arg: { event: EventApi, el: HTMLElement, jsEvent: MouseEvent, view: View }): void
   eventDragStop?(arg: { event: EventApi, el: HTMLElement, jsEvent: MouseEvent, view: View }): void

+ 1 - 1
tests/automated/event-source/refetch.js

@@ -92,7 +92,7 @@ describe('event source refetch', function() {
       fetchDelay = 100
 
       initCalendar({
-        eventAfterAllRender() {
+        _eventsRendered() {
 
           // events from unaffected sources remain
           expect($('.source2-7').length).toEqual(1)

+ 2 - 2
tests/automated/event-source/remove.js

@@ -14,7 +14,7 @@ describe('event source remove', function() {
           { title: 'event2', start: '2014-08-02' }
         ]
       } ],
-      eventAfterAllRender() {
+      _eventsRendered() {
         callCnt++
         if (callCnt === 1) {
           expectEventCnt(2)
@@ -57,7 +57,7 @@ describe('event source remove', function() {
 
     initCalendar({
       eventSources: [ source1 ],
-      eventAfterAllRender() {
+      _eventsRendered() {
         if (!$('.fc-event').length) {
           ; // might have rendered no events after removeEventSource call
         } else {

+ 1 - 1
tests/automated/legacy/addEventSource.js

@@ -71,7 +71,7 @@ describe('addEventSource', function() {
   function go(addFunc, extraTestFunc, doneFunc) {
     var callCnt = 0
     var options = {}
-    options.eventAfterAllRender = function() {
+    options._eventsRendered = function() {
       callCnt++
       if (callCnt === 2) { // once for initial render. second time for addEventSource
 

+ 35 - 35
tests/automated/legacy/background-events.js

@@ -36,7 +36,7 @@ describe('background events', function() {
           start: '2014-11-04',
           rendering: 'background'
         } ]
-        options.eventAfterAllRender = function() {
+        options._eventsRendered = function() {
           expect(getBackgroundEventEls().length).toBe(1)
           expect(getBackgroundEventEls(getDayGridRowEls().eq(1)).length).toBe(1)
           expect(getSingleBackgroundEventEl()).toBeLeftOf('.fc-day[data-date="2014-11-05"]')
@@ -54,7 +54,7 @@ describe('background events', function() {
           end: '2014-11-11',
           rendering: 'background'
         } ]
-        options.eventAfterAllRender = function() {
+        options._eventsRendered = function() {
           expect(getBackgroundEventEls().length).toBe(2)
           expect(getBackgroundEventEls(getDayGridRowEls().eq(1)).length).toBe(1)
           expect(getBackgroundEventEls(getDayGridRowEls().eq(2)).length).toBe(1)
@@ -79,7 +79,7 @@ describe('background events', function() {
             rendering: 'background'
           }
         ]
-        options.eventAfterAllRender = function() {
+        options._eventsRendered = function() {
           expect(getBackgroundEventEls().length).toBe(2)
           expect(getBackgroundEventEls(getDayGridRowEls().eq(1)).length).toBe(2)
           expect(getBackgroundEventEls().eq(0)).toBeRightOf('.fc-day[data-date="2014-11-02"]')
@@ -98,7 +98,7 @@ describe('background events', function() {
             end: '2014-11-09',
             rendering: 'background'
           } ]
-          options.eventAfterAllRender = function() {
+          options._eventsRendered = function() {
             expect(getBackgroundEventEls().length).toBe(1)
             expect(getBackgroundEventEls(getDayGridRowEls().eq(1)).length).toBe(1)
             expect(getBackgroundEventEls()).toBeRightOf('.fc-day-grid .fc-row:eq(1) .fc-week-number')
@@ -111,7 +111,7 @@ describe('background events', function() {
       it('renders "business hours" on whole days', function(done) {
         var options = {}
         options.businessHours = true
-        options.eventAfterAllRender = function() {
+        options._eventsRendered = function() {
           setTimeout(function() { // no trigger when business hours renders. this will have to do.
             expect(getNonBusinessDayEls().length).toBe(12) // there are 6 weeks. 2 weekend days each
             done()
@@ -131,7 +131,7 @@ describe('background events', function() {
           start: '2014-11-04',
           rendering: 'background'
         } ]
-        options.eventAfterAllRender = function() {
+        options._eventsRendered = function() {
           expect(getBackgroundEventEls().length).toBe(1)
           expect(getBackgroundEventEls(getDayGridRowEls().eq(1)).length).toBe(1)
           expect(getBackgroundEventEls()).toBeRightOf('.fc-day[data-date="2014-11-06"]')
@@ -148,7 +148,7 @@ describe('background events', function() {
           end: '2014-11-11',
           rendering: 'background'
         } ]
-        options.eventAfterAllRender = function() {
+        options._eventsRendered = function() {
           expect(getBackgroundEventEls().length).toBe(2)
           expect(getBackgroundEventEls(getDayGridRowEls().eq(1)).length).toBe(1)
           expect(getBackgroundEventEls(getDayGridRowEls().eq(2)).length).toBe(1)
@@ -168,7 +168,7 @@ describe('background events', function() {
             end: '2014-11-09',
             rendering: 'background'
           } ]
-          options.eventAfterAllRender = function() {
+          options._eventsRendered = function() {
             expect(getBackgroundEventEls().length).toBe(1)
             expect(getBackgroundEventEls(getDayGridRowEls().eq(1)).length).toBe(1)
             expect(getBackgroundEventEls()).toBeLeftOf('.fc-day-grid .fc-row:eq(1) .fc-week-number span')
@@ -190,7 +190,7 @@ describe('background events', function() {
             start: '2014-11-04',
             rendering: 'inverse-background'
           } ]
-          options.eventAfterAllRender = function() {
+          options._eventsRendered = function() {
             expect(getBackgroundEventEls().length).toBe(7)
             expect(getBackgroundEventEls(getDayGridRowEls().eq(0)).length).toBe(1)
             expect(getBackgroundEventEls(getDayGridRowEls().eq(1)).length).toBe(2)
@@ -217,7 +217,7 @@ describe('background events', function() {
             end: '2014-11-11',
             rendering: 'inverse-background'
           } ]
-          options.eventAfterAllRender = function() {
+          options._eventsRendered = function() {
             expect(getBackgroundEventEls().length).toBe(6)
             expect(getBackgroundEventEls(getDayGridRowEls().eq(0)).length).toBe(1)
             expect(getBackgroundEventEls(getDayGridRowEls().eq(1)).length).toBe(1)
@@ -244,7 +244,7 @@ describe('background events', function() {
             end: '2014-11-06',
             rendering: 'inverse-background'
           } ]
-          options.eventAfterAllRender = function() {
+          options._eventsRendered = function() {
             expect(getBackgroundEventEls().length).toBe(5)
             expect(getBackgroundEventEls(getDayGridRowEls().eq(0)).length).toBe(0)
             expect(getBackgroundEventEls(getDayGridRowEls().eq(1)).length).toBe(1)
@@ -267,7 +267,7 @@ describe('background events', function() {
             end: '2014-12-08',
             rendering: 'inverse-background'
           } ]
-          options.eventAfterAllRender = function() {
+          options._eventsRendered = function() {
             expect(getBackgroundEventEls().length).toBe(5)
             expect(getBackgroundEventEls(getDayGridRowEls().eq(0)).length).toBe(1)
             expect(getBackgroundEventEls(getDayGridRowEls().eq(1)).length).toBe(1)
@@ -297,7 +297,7 @@ describe('background events', function() {
               rendering: 'inverse-background'
             }
           ]
-          options.eventAfterAllRender = function() {
+          options._eventsRendered = function() {
             expect(getBackgroundEventEls().length).toBe(8)
             expect(getBackgroundEventEls(getDayGridRowEls().eq(0)).length).toBe(1)
             expect(getBackgroundEventEls(getDayGridRowEls().eq(1)).length).toBe(3)
@@ -329,7 +329,7 @@ describe('background events', function() {
             start: '2014-11-04',
             rendering: 'inverse-background'
           } ]
-          options.eventAfterAllRender = function() {
+          options._eventsRendered = function() {
             expect(getBackgroundEventEls().length).toBe(7)
             expect(getBackgroundEventEls(getDayGridRowEls().eq(0)).length).toBe(1)
             expect(getBackgroundEventEls(getDayGridRowEls().eq(1)).length).toBe(2)
@@ -362,7 +362,7 @@ describe('background events', function() {
             start: '2014-11-04'
           } ]
         } ]
-        options.eventAfterAllRender = function() {
+        options._eventsRendered = function() {
           expect(getBackgroundEventEls().length).toBe(1)
           expect(getEventEls().length).toBe(0)
           done()
@@ -381,7 +381,7 @@ describe('background events', function() {
             start: '2014-11-04T01:00:00'
           } ]
         } ]
-        options.eventAfterAllRender = function() {
+        options._eventsRendered = function() {
           expect(getBackgroundEventEls().length).toBe(1)
           expect(getEventEls().length).toBe(0)
           done()
@@ -402,7 +402,7 @@ describe('background events', function() {
           end: '2014-11-04T05:00:00',
           rendering: 'background'
         } ]
-        options.eventAfterAllRender = function() {
+        options._eventsRendered = function() {
           expect(getBackgroundEventEls().length).toBe(1)
           expect(queryBgEventsInCol(2).length).toBe(1) // column 2
           expect(getBackgroundEventEls()).toBeBelow('.fc-slats tr:eq(0)') // should be 1am (eq(1)) but FF cmplaning
@@ -420,7 +420,7 @@ describe('background events', function() {
           end: '2014-11-05T05:00:00',
           rendering: 'background'
         } ]
-        options.eventAfterAllRender = function() {
+        options._eventsRendered = function() {
           expect(getBackgroundEventEls().length).toBe(2)
           expect(queryBgEventsInCol(2).length).toBe(1)
           expect(queryBgEventsInCol(3).length).toBe(1)
@@ -443,7 +443,7 @@ describe('background events', function() {
             rendering: 'background'
           }
         ]
-        options.eventAfterAllRender = function() {
+        options._eventsRendered = function() {
           expect(getBackgroundEventEls().length).toBe(4)
           expect(queryBgEventsInCol(2).length).toBe(2)
           expect(queryBgEventsInCol(3).length).toBe(2)
@@ -493,7 +493,7 @@ describe('background events', function() {
           end: '2014-11-04T05:00:00',
           rendering: 'background'
         } ]
-        options.eventAfterAllRender = function() {
+        options._eventsRendered = function() {
           expect(getBackgroundEventEls().length).toBe(1)
           expect(queryBgEventsInCol(4).length).toBe(1)
           expect(getBackgroundEventEls()).toBeBelow('.fc-slats tr:eq(0)') // should be 1am (eq(1)) but FF cmplaining
@@ -509,7 +509,7 @@ describe('background events', function() {
           end: '2014-11-05T05:00:00',
           rendering: 'background'
         } ]
-        options.eventAfterAllRender = function() {
+        options._eventsRendered = function() {
           expect(getBackgroundEventEls().length).toBe(2)
           expect(queryBgEventsInCol(3).length).toBe(1)
           expect(queryBgEventsInCol(4).length).toBe(1)
@@ -554,7 +554,7 @@ describe('background events', function() {
             end: '2014-11-04T05:00:00',
             rendering: 'inverse-background'
           } ]
-          options.eventAfterAllRender = function() {
+          options._eventsRendered = function() {
             expect(getBackgroundEventEls().length).toBe(8)
             expect(queryBgEventsInCol(0).length).toBe(1)
             expect(queryBgEventsInCol(1).length).toBe(1)
@@ -576,7 +576,7 @@ describe('background events', function() {
             end: '2014-11-05T05:00:00',
             rendering: 'inverse-background'
           } ]
-          options.eventAfterAllRender = function() {
+          options._eventsRendered = function() {
             expect(getBackgroundEventEls().length).toBe(7)
             expect(queryBgEventsInCol(0).length).toBe(1)
             expect(queryBgEventsInCol(1).length).toBe(1)
@@ -598,7 +598,7 @@ describe('background events', function() {
             end: '2014-11-04T05:00:00',
             rendering: 'inverse-background'
           } ]
-          options.eventAfterAllRender = function() {
+          options._eventsRendered = function() {
             expect(getBackgroundEventEls().length).toBe(5)
             expect(queryBgEventsInCol(0).length).toBe(0)
             expect(queryBgEventsInCol(1).length).toBe(0)
@@ -620,7 +620,7 @@ describe('background events', function() {
             end: '2014-11-12T05:00:00',
             rendering: 'inverse-background'
           } ]
-          options.eventAfterAllRender = function() {
+          options._eventsRendered = function() {
             expect(getBackgroundEventEls().length).toBe(3)
             expect(queryBgEventsInCol(0).length).toBe(1)
             expect(queryBgEventsInCol(1).length).toBe(1)
@@ -647,7 +647,7 @@ describe('background events', function() {
               rendering: 'inverse-background'
             }
           ]
-          options.eventAfterAllRender = function() {
+          options._eventsRendered = function() {
             expect(getBackgroundEventEls().length).toBe(9)
             expect(queryBgEventsInCol(0).length).toBe(1)
             expect(queryBgEventsInCol(1).length).toBe(2)
@@ -678,7 +678,7 @@ describe('background events', function() {
               rendering: 'inverse-background'
             }
           ]
-          options.eventAfterAllRender = function() {
+          options._eventsRendered = function() {
             expect(getBackgroundEventEls().length).toBe(8)
             expect(queryBgEventsInCol(0).length).toBe(1)
             expect(queryBgEventsInCol(1).length).toBe(1)
@@ -707,7 +707,7 @@ describe('background events', function() {
             end: '2014-11-04T05:00:00',
             rendering: 'inverse-background'
           } ]
-          options.eventAfterAllRender = function() {
+          options._eventsRendered = function() {
             expect(getBackgroundEventEls().length).toBe(8)
             expect(queryBgEventsInCol(0).length).toBe(1)
             expect(queryBgEventsInCol(1).length).toBe(1)
@@ -731,7 +731,7 @@ describe('background events', function() {
             end: '2014-01-01T05:00:00',
             rendering: 'inverse-background'
           } ]
-          options.eventAfterAllRender = function() {
+          options._eventsRendered = function() {
             expect(getBackgroundEventEls().length).toBe(7)
             done()
           }
@@ -747,7 +747,7 @@ describe('background events', function() {
         rendering: 'background',
         color: 'red'
       } ]
-      options.eventAfterAllRender = function() {
+      options._eventsRendered = function() {
         expect(getBackgroundEventEls().css('background-color')).toMatch(RED_REGEX)
         done()
       }
@@ -761,7 +761,7 @@ describe('background events', function() {
         rendering: 'background',
         backgroundColor: 'red'
       } ]
-      options.eventAfterAllRender = function() {
+      options._eventsRendered = function() {
         expect(getBackgroundEventEls().css('background-color')).toMatch(RED_REGEX)
         done()
       }
@@ -777,7 +777,7 @@ describe('background events', function() {
           rendering: 'background'
         } ]
       } ]
-      options.eventAfterAllRender = function() {
+      options._eventsRendered = function() {
         expect(getBackgroundEventEls().css('background-color')).toMatch(RED_REGEX)
         done()
       }
@@ -793,7 +793,7 @@ describe('background events', function() {
           rendering: 'background'
         } ]
       } ]
-      options.eventAfterAllRender = function() {
+      options._eventsRendered = function() {
         expect(getBackgroundEventEls().css('background-color')).toMatch(RED_REGEX)
         done()
       }
@@ -809,7 +809,7 @@ describe('background events', function() {
           rendering: 'background'
         } ]
       } ]
-      options.eventAfterAllRender = function() {
+      options._eventsRendered = function() {
         expect(getBackgroundEventEls().css('background-color')).toMatch(RED_REGEX)
         done()
       }
@@ -825,7 +825,7 @@ describe('background events', function() {
           rendering: 'background'
         } ]
       } ]
-      options.eventAfterAllRender = function() {
+      options._eventsRendered = function() {
         expect(getBackgroundEventEls().css('background-color')).toMatch(RED_REGEX)
         done()
       }

+ 1 - 1
tests/automated/legacy/defaultAllDayEventDuration.js

@@ -75,7 +75,7 @@ describe('defaultAllDayEventDuration', function() {
               start: '2014-04-28'
             }
           ],
-          eventAfterAllRender: function() {
+          _eventsRendered: function() {
             var eventElms = getEventEls()
             var width0 = eventElms.eq(0).outerWidth()
             var width1 = eventElms.eq(1).outerWidth()

+ 2 - 2
tests/automated/legacy/defaultTimedEventDuration.js

@@ -73,7 +73,7 @@ describe('defaultTimedEventDuration', function() {
               start: '2014-05-02T04:00:00'
             }
           ],
-          eventAfterAllRender: function() {
+          _eventsRendered: function() {
             var eventElms = getEventEls()
             var height0 = eventElms.eq(0).outerHeight()
             var height1 = eventElms.eq(1).outerHeight()
@@ -110,7 +110,7 @@ describe('defaultTimedEventDuration', function() {
               start: '2014-04-28T04:00:00'
             }
           ],
-          eventAfterAllRender: function() {
+          _eventsRendered: function() {
             var eventElms = getEventEls()
             var width0 = eventElms.eq(0).outerWidth()
             var width1 = eventElms.eq(1).outerWidth()

+ 7 - 7
tests/automated/legacy/displayEventEnd.js

@@ -28,7 +28,7 @@ describe('displayEventEnd', function() {
               end: '2014-06-13',
               allDay: true
             } ],
-            eventAfterAllRender: function() {
+            _eventsRendered: function() {
               expect(getEventElTimeEl(getSingleEl()).length).toBe(0)
               done()
             }
@@ -44,7 +44,7 @@ describe('displayEventEnd', function() {
               start: '2014-06-13T01:00:00',
               allDay: false
             } ],
-            eventAfterAllRender: function() {
+            _eventsRendered: function() {
               expect(getEventElTimeEl(getSingleEl())).toHaveText('1:00 AM')
               done()
             }
@@ -61,7 +61,7 @@ describe('displayEventEnd', function() {
               end: '2014-06-13T02:00:00',
               allDay: false
             } ],
-            eventAfterAllRender: function() {
+            _eventsRendered: function() {
               expect(getEventElTimeEl(getSingleEl())).toHaveText('1:00 AM')
               done()
             }
@@ -85,7 +85,7 @@ describe('displayEventEnd', function() {
               end: '2014-06-13',
               allDay: true
             } ],
-            eventAfterAllRender: function() {
+            _eventsRendered: function() {
               expect(getEventElTimeEl(getSingleEl()).length).toBe(0)
               done()
             }
@@ -101,7 +101,7 @@ describe('displayEventEnd', function() {
               start: '2014-06-13T01:00:00',
               allDay: false
             } ],
-            eventAfterAllRender: function() {
+            _eventsRendered: function() {
               expect(getEventElTimeEl(getSingleEl())).toHaveText('1:00 AM')
               done()
             }
@@ -118,7 +118,7 @@ describe('displayEventEnd', function() {
               end: '2014-06-13T01:00:00',
               allDay: false
             } ],
-            eventAfterAllRender: function() {
+            _eventsRendered: function() {
               expect(getEventElTimeEl(getSingleEl())).toHaveText('1:00 AM')
               done()
             }
@@ -135,7 +135,7 @@ describe('displayEventEnd', function() {
               end: '2014-06-13T02:00:00',
               allDay: false
             } ],
-            eventAfterAllRender: function() {
+            _eventsRendered: function() {
               expect(getEventElTimeEl(getSingleEl())).toHaveText('1:00 AM - 2:00 AM')
               done()
             }

+ 1 - 1
tests/automated/legacy/event-dnd.js

@@ -386,7 +386,7 @@ describe('eventDrop', function() {
   function init(dragFunc, dropHandler) {
     var eventsRendered = false
 
-    options.eventAfterAllRender = function() {
+    options._eventsRendered = function() {
       if (!eventsRendered) { // because event rerendering will happen upon drop
         dragFunc()
         eventsRendered = true

+ 6 - 6
tests/automated/legacy/event-resize.js

@@ -103,7 +103,7 @@ describe('eventResize', function() {
           start: '2014-06-11T08:00:00',
           allDay: false
         } ]
-        options.eventAfterAllRender = function() {
+        options._eventsRendered = function() {
           expect($('.fc-event .fc-resizer').length).toBe(0)
           done()
         }
@@ -310,7 +310,7 @@ describe('eventResize', function() {
 
       it('should display the correct time text while resizing', function(done) {
         var options = {}
-        options.eventAfterAllRender = function() {
+        options._eventsRendered = function() {
           setTimeout(function() {
             var dy = $('.fc-slats tr:eq(1)').height() * 5; // 5 slots, so 2.5 hours
             $('.fc-event').simulate('mouseover') // for revealing resizer
@@ -343,7 +343,7 @@ describe('eventResize', function() {
           $(arg.el).addClass('didEventRender')
         }
 
-        options.eventAfterAllRender = function() {
+        options._eventsRendered = function() {
           setTimeout(function() {
             var dy = $('.fc-slats tr:eq(1)').height() * 5 // 5 slots, so 2.5 hours
             $('.fc-event').simulate('mouseover') // for revealing resizer
@@ -382,7 +382,7 @@ describe('eventResize', function() {
           }
         }
 
-        options.eventAfterAllRender = function() {
+        options._eventsRendered = function() {
           if (alreadyRendered) {
             return
           }
@@ -418,7 +418,7 @@ describe('eventResize', function() {
 
       it('should display the correct time text while resizing', function(done) {
         var options = {}
-        options.eventAfterAllRender = function() {
+        options._eventsRendered = function() {
           setTimeout(function() {
             var dy = $('.fc-slats tr:eq(1)').height() * 5 // 5 slots, so 2.5 hours
             $('.fc-event').simulate('mouseover') // for revealing resizer
@@ -452,7 +452,7 @@ describe('eventResize', function() {
   function init(options, resizeStartFunc, resizeDoneFunc) {
     var eventsRendered = false
 
-    options.eventAfterAllRender = function() {
+    options._eventsRendered = function() {
       if (!eventsRendered) { // because event rerendering will happen when resize is over
         resizeStartFunc()
         eventsRendered = true

+ 5 - 5
tests/automated/legacy/eventLimit-popover.js

@@ -385,34 +385,34 @@ describe('eventLimit popover', function() {
       ],
       eventRender: function() {},
       eventRendered: function() {},
-      eventAfterAllRender: function() {},
+      _eventsRendered: function() {},
       eventDestroy: function() {}
     }
 
     spyOn(options, 'eventRender')
     spyOn(options, 'eventRendered')
-    spyOn(options, 'eventAfterAllRender')
+    spyOn(options, '_eventsRendered')
     spyOn(options, 'eventDestroy')
 
     initCalendar(options)
 
     expect(options.eventRender.calls.count()).toBe(4)
     expect(options.eventRendered.calls.count()).toBe(4)
-    expect(options.eventAfterAllRender.calls.count()).toBe(1)
+    expect(options._eventsRendered.calls.count()).toBe(1)
     expect(options.eventDestroy.calls.count()).toBe(0)
 
     $('.fc-more').simulate('click')
 
     expect(options.eventRender.calls.count()).toBe(8) // +4
     expect(options.eventRendered.calls.count()).toBe(8) // +4
-    expect(options.eventAfterAllRender.calls.count()).toBe(1) // stays same!
+    expect(options._eventsRendered.calls.count()).toBe(1) // stays same!
     expect(options.eventDestroy.calls.count()).toBe(0)
 
     $('.fc-more-popover .fc-close').simulate('click')
 
     expect(options.eventRender.calls.count()).toBe(8)
     expect(options.eventRendered.calls.count()).toBe(8)
-    expect(options.eventAfterAllRender.calls.count()).toBe(1)
+    expect(options._eventsRendered.calls.count()).toBe(1)
     expect(options.eventDestroy.calls.count()).toBe(4) // +4
   })
 

+ 15 - 15
tests/automated/legacy/eventRender.js

@@ -31,7 +31,7 @@ describe('eventRender', function() {
               expect(arg.isMirror).toBe(false)
               $(arg.el).css('font-size', '20px')
             },
-            eventAfterAllRender: function() {
+            _eventsRendered: function() {
               expect($(gridSelector).find('.fc-event').css('font-size')).toBe('20px')
               expect(options.eventRender).toHaveBeenCalled()
               done()
@@ -60,7 +60,7 @@ describe('eventRender', function() {
           eventRender: function(arg) {
             return $('<div class="fc-event sup" style="background-color:green">sup g</div>')[0]
           },
-          eventAfterAllRender: function() {
+          _eventsRendered: function() {
             expect($('.fc-day-grid .sup').length).toBe(1)
             expect(options.eventRender).toHaveBeenCalled()
             done()
@@ -74,7 +74,7 @@ describe('eventRender', function() {
           eventRender: function(arg) {
             return false
           },
-          eventAfterAllRender: function() {
+          _eventsRendered: function() {
             expect($('.fc-day-grid .fc-event').length).toBe(0)
             expect(options.eventRender).toHaveBeenCalled()
             done()
@@ -105,7 +105,7 @@ describe('eventRender', function() {
             expect(typeof arg.view).toBe('object')
             $(arg.el).css('font-size', '20px')
           },
-          eventAfterAllRender: function() {
+          _eventsRendered: function() {
             expect($('.fc-day-grid .fc-bgevent').css('font-size')).toBe('20px')
             expect(options.eventRender).toHaveBeenCalled()
             done()
@@ -120,7 +120,7 @@ describe('eventRender', function() {
           eventRender: function(arg) {
             return $('<td class="sup" style="background-color:green">sup g</td>')[0]
           },
-          eventAfterAllRender: function() {
+          _eventsRendered: function() {
             expect($('.fc-day-grid .sup').length).toBe(1)
             expect(options.eventRender).toHaveBeenCalled()
             done()
@@ -135,7 +135,7 @@ describe('eventRender', function() {
           eventRender: function(arg) {
             return $('<div class="sup" style="background-color:green">sup g</div>')[0]
           },
-          eventAfterAllRender: function() {
+          _eventsRendered: function() {
             expect($('.fc-day-grid .sup').length).toBe(0)
             expect(options.eventRender).toHaveBeenCalled()
             done()
@@ -150,7 +150,7 @@ describe('eventRender', function() {
           eventRender: function(arg) {
             return false
           },
-          eventAfterAllRender: function() {
+          _eventsRendered: function() {
             expect($('.fc-day-grid .fc-bgevent').length).toBe(0)
             expect(options.eventRender).toHaveBeenCalled()
             done()
@@ -174,7 +174,7 @@ describe('eventRender', function() {
       it('won\'t render or call eventRender', function(done) {
         var options = {
           eventRender: function(arg) {},
-          eventAfterAllRender: function() {
+          _eventsRendered: function() {
             expect($('.fc-day-grid .fc-bgevent').length).toBe(0)
             expect(options.eventRender).not.toHaveBeenCalled()
             done()
@@ -206,7 +206,7 @@ describe('eventRender', function() {
           eventRender: function(arg) {
             return $('<div class="fc-event sup" style="background-color:green">sup g</div>')[0]
           },
-          eventAfterAllRender: function() {
+          _eventsRendered: function() {
             expect($('.fc-time-grid .sup').length).toBe(1)
             expect(options.eventRender).toHaveBeenCalled()
             done()
@@ -221,7 +221,7 @@ describe('eventRender', function() {
           eventRender: function(arg) {
             return false
           },
-          eventAfterAllRender: function() {
+          _eventsRendered: function() {
             expect($('.fc-time-grid .fc-event').length).toBe(0)
             expect(options.eventRender).toHaveBeenCalled()
             done()
@@ -252,7 +252,7 @@ describe('eventRender', function() {
             expect(typeof arg.view).toBe('object')
             $(arg.el).css('font-size', '20px')
           },
-          eventAfterAllRender: function() {
+          _eventsRendered: function() {
             expect($('.fc-time-grid .fc-bgevent').css('font-size')).toBe('20px')
             expect(options.eventRender).toHaveBeenCalled()
             done()
@@ -267,7 +267,7 @@ describe('eventRender', function() {
           eventRender: function() {
             return $('<div class="fc-bgevent sup" style="background-color:green">sup g</div>')[0]
           },
-          eventAfterAllRender: function() {
+          _eventsRendered: function() {
             expect($('.fc-time-grid .sup').length).toBe(1)
             expect(options.eventRender).toHaveBeenCalled()
             done()
@@ -282,7 +282,7 @@ describe('eventRender', function() {
           eventRender: function() {
             return $('<p class="fc-bgevent sup" style="background-color:green">sup g</p>')[0]
           },
-          eventAfterAllRender: function() {
+          _eventsRendered: function() {
             expect($('.fc-time-grid .sup').length).toBe(0)
             expect(options.eventRender).toHaveBeenCalled()
             done()
@@ -296,7 +296,7 @@ describe('eventRender', function() {
           eventRender: function() {
             return false
           },
-          eventAfterAllRender: function() {
+          _eventsRendered: function() {
             expect($('.fc-time-grid .fc-bgevent').length).toBe(0)
             expect(options.eventRender).toHaveBeenCalled()
             done()
@@ -320,7 +320,7 @@ describe('eventRender', function() {
       it('will render in all-day AND timed slots', function(done) {
         var options = {
           eventRender: function() {},
-          eventAfterAllRender: function() {
+          _eventsRendered: function() {
             expect($('.fc-day-grid .fc-bgevent').length).toBe(1)
             expect($('.fc-time-grid .fc-bgevent').length).toBe(1)
             expect(options.eventRender).toHaveBeenCalled()

+ 17 - 17
tests/automated/legacy/events-gcal.js

@@ -46,7 +46,7 @@ xdescribe('Google Calendar plugin', function() {
     options.googleCalendarApiKey = API_KEY
     options.events = { googleCalendarId: HOLIDAY_CALENDAR_ID }
     options.timeZone = 'local'
-    options.eventAfterAllRender = function() {
+    options._eventsRendered = function() {
       var events = currentCalendar.getEvents()
       var i
 
@@ -64,7 +64,7 @@ xdescribe('Google Calendar plugin', function() {
     options.googleCalendarApiKey = API_KEY
     options.events = { googleCalendarId: HOLIDAY_CALENDAR_ID }
     options.timeZone = 'UTC'
-    options.eventAfterAllRender = function() {
+    options._eventsRendered = function() {
       var events = currentCalendar.getEvents()
       var i
 
@@ -82,7 +82,7 @@ xdescribe('Google Calendar plugin', function() {
     options.googleCalendarApiKey = API_KEY
     options.events = { googleCalendarId: HOLIDAY_CALENDAR_ID }
     options.timeZone = 'America/New York'
-    options.eventAfterAllRender = function() {
+    options._eventsRendered = function() {
       var events = currentCalendar.getEvents()
       var eventEls = $('.fc-event')
       var i
@@ -106,7 +106,7 @@ xdescribe('Google Calendar plugin', function() {
       googleCalendarId: HOLIDAY_CALENDAR_ID,
       editable: true
     }
-    options.eventAfterAllRender = function() {
+    options._eventsRendered = function() {
       var eventEls = $('.fc-event')
       expect(eventEls.length).toBe(NUM_EVENTS)
       expect(eventEls.find('.fc-resizer').length).toBeGreaterThan(0) // editable!
@@ -120,7 +120,7 @@ xdescribe('Google Calendar plugin', function() {
       googleCalendarId: HOLIDAY_CALENDAR_ID,
       googleCalendarApiKey: API_KEY
     }
-    options.eventAfterAllRender = function() {
+    options._eventsRendered = function() {
       var events = currentCalendar.getEvents()
       expect(events.length).toBe(NUM_EVENTS) // 5 holidays in November 2016 (and end of Oct)
       done()
@@ -139,7 +139,7 @@ xdescribe('Google Calendar plugin', function() {
         },
         googleCalendarId: HOLIDAY_CALENDAR_ID
       }
-      options.eventAfterAllRender = function() {
+      options._eventsRendered = function() {
         var events = currentCalendar.getEvents()
 
         expect(events.length).toBe(0)
@@ -167,7 +167,7 @@ xdescribe('Google Calendar plugin', function() {
         },
         googleCalendarId: HOLIDAY_CALENDAR_ID
       }
-      options.eventAfterAllRender = function() {
+      options._eventsRendered = function() {
         var events = currentCalendar.getEvents()
 
         expect(events.length).toBe(0)
@@ -186,7 +186,7 @@ xdescribe('Google Calendar plugin', function() {
   it('works when `events` is the actual calendar ID', function(done) {
     options.googleCalendarApiKey = API_KEY
     options.events = HOLIDAY_CALENDAR_ID
-    options.eventAfterAllRender = function() {
+    options._eventsRendered = function() {
       var events = currentCalendar.getEvents()
       expect(events.length).toBe(NUM_EVENTS) // 5 holidays in November 2016 (and end of Oct)
       done()
@@ -197,7 +197,7 @@ xdescribe('Google Calendar plugin', function() {
   it('detects a gcal when `events` is the actual calendar ID, with complicated characters (1)', function(done) {
     options.googleCalendarApiKey = API_KEY
     options.events = '[email protected]'
-    options.eventAfterAllRender = function() {
+    options._eventsRendered = function() {
       expect(currentWarnArgs.length).toBe(2)
       expect(typeof currentWarnArgs[1]).toBe('object') // sent the request to google, but not-found warning
       done()
@@ -208,7 +208,7 @@ xdescribe('Google Calendar plugin', function() {
   it('detects a gcal when `events` is the actual calendar ID, with complicated characters (2)', function(done) {
     options.googleCalendarApiKey = API_KEY
     options.events = '[email protected]'
-    options.eventAfterAllRender = function() {
+    options._eventsRendered = function() {
       expect(currentWarnArgs.length).toBe(2)
       expect(typeof currentWarnArgs[1]).toBe('object') // sent the request to google, but not-found warning
       done()
@@ -219,7 +219,7 @@ xdescribe('Google Calendar plugin', function() {
   it('detects a gcal when `events` is the actual calendar ID, person gmail', function(done) {
     options.googleCalendarApiKey = API_KEY
     options.events = '[email protected]'
-    options.eventAfterAllRender = function() {
+    options._eventsRendered = function() {
       expect(currentWarnArgs.length).toBe(2)
       expect(typeof currentWarnArgs[1]).toBe('object') // sent the request to google, but not-found warning
       done()
@@ -230,7 +230,7 @@ xdescribe('Google Calendar plugin', function() {
   it('detects a gcal when `events` is the actual calendar ID, person googlemail', function(done) {
     options.googleCalendarApiKey = API_KEY
     options.events = '[email protected]'
-    options.eventAfterAllRender = function() {
+    options._eventsRendered = function() {
       expect(currentWarnArgs.length).toBe(2)
       expect(typeof currentWarnArgs[1]).toBe('object') // sent the request to google, but not-found warning
       done()
@@ -241,7 +241,7 @@ xdescribe('Google Calendar plugin', function() {
   it('works with requesting an HTTP V1 API feed URL', function(done) {
     options.googleCalendarApiKey = API_KEY
     options.events = 'http://www.google.com/calendar/feeds/usa__en%40holiday.calendar.google.com/public/basic'
-    options.eventAfterAllRender = function() {
+    options._eventsRendered = function() {
       var events = currentCalendar.getEvents()
       expect(events.length).toBe(NUM_EVENTS) // 5 holidays in November 2016 (and end of Oct)
       done()
@@ -252,7 +252,7 @@ xdescribe('Google Calendar plugin', function() {
   it('works with requesting an HTTPS V1 API feed URL', function(done) {
     options.googleCalendarApiKey = API_KEY
     options.events = 'https://www.google.com/calendar/feeds/usa__en%40holiday.calendar.google.com/public/basic'
-    options.eventAfterAllRender = function() {
+    options._eventsRendered = function() {
       var events = currentCalendar.getEvents()
       expect(events.length).toBe(NUM_EVENTS) // 5 holidays in November 2016 (and end of Oct)
       done()
@@ -264,7 +264,7 @@ xdescribe('Google Calendar plugin', function() {
     options.googleCalendarApiKey = API_KEY
     options.events =
       'https://www.googleapis.com/calendar/v3/calendars/usa__en%40holiday.calendar.google.com/events'
-    options.eventAfterAllRender = function() {
+    options._eventsRendered = function() {
       var events = currentCalendar.getEvents()
       expect(events.length).toBe(NUM_EVENTS) // 5 holidays in November 2016 (and end of Oct)
       done()
@@ -299,7 +299,7 @@ xdescribe('Google Calendar plugin', function() {
 
       options.googleCalendarApiKey = API_KEY
       options.eventSources = [ { googleCalendarId: HOLIDAY_CALENDAR_ID } ]
-      options.eventAfterAllRender = function() {
+      options._eventsRendered = function() {
         var events
 
         if (called) { return } // only the first time
@@ -325,7 +325,7 @@ xdescribe('Google Calendar plugin', function() {
 
       options.googleCalendarApiKey = API_KEY
       options.eventSources = [ googleSource ]
-      options.eventAfterAllRender = function() {
+      options._eventsRendered = function() {
         var events
 
         if (called) { return } // only the first time

+ 1 - 1
tests/automated/legacy/events-json-feed.js

@@ -161,7 +161,7 @@ describe('events as a json feed', function() {
       loading: function(bool) {
         loadingCallArgs.push(bool)
       },
-      eventAfterAllRender: function() {
+      _eventsRendered: function() {
         expect(loadingCallArgs).toEqual([ true, false ])
         done()
       }

+ 2 - 2
tests/automated/legacy/refetchEvents.js

@@ -22,7 +22,7 @@ describe('refetchEvents', function() {
             ])
           }, 100)
         },
-        eventAfterAllRender: function() {
+        _eventsRendered: function() {
           var scrollEl = $('.fc-time-grid-container.fc-scroller')
           renderCalls++
           if (renderCalls === 1) {
@@ -100,7 +100,7 @@ describe('refetchEvents', function() {
         }
         initCalendar({
           eventSources: eventSources,
-          eventAfterAllRender: function() {
+          _eventsRendered: function() {
             fetchCount++
             if (fetchCount === 1) {
               // after the initial rendering of events, call refetchEvents

+ 1 - 1
tests/automated/legacy/removeEvents.js

@@ -120,7 +120,7 @@ describe('removeEvents', function() {
     var called = false
     initCalendar({
       events: events,
-      eventAfterAllRender: function() {
+      _eventsRendered: function() {
         if (!called) { // don't execute on subsequent removeEvents/next/prev
           called = true
 

+ 1 - 1
tests/automated/legacy/rerenderDelay.js

@@ -18,7 +18,7 @@ describe('rerenderDelay', function() {
       defaultView: 'agendaDay',
       events: eventSource1,
       rerenderDelay: 0, // will still debounce despite being zero
-      eventAfterAllRender: function() {
+      _eventsRendered: function() {
         eventRenderCnt++
         if (eventRenderCnt === 2) {
 

+ 1 - 1
tests/automated/legacy/scroll-state.js

@@ -63,7 +63,7 @@ describe('scroll state', function() {
         events: [ {
           start: '2015-02-20'
         } ],
-        eventAfterAllRender: function() {
+        _eventsRendered: function() {
           if (++calls === 1) {
             eventEl0 = $('.fc-event', calendarEl)
             expect(eventEl0.length).toBe(1)

+ 4 - 4
tests/automated/legacy/timeZone.js

@@ -29,7 +29,7 @@ describe('timeZone', function() {
   it('receives events correctly when local timezone', function(done) {
     initCalendar({
       timeZone: 'local',
-      eventAfterAllRender: function() {
+      _eventsRendered: function() {
         expectLocalTimezone()
         done()
       }
@@ -52,7 +52,7 @@ describe('timeZone', function() {
   it('receives events correctly when UTC timezone', function(done) {
     initCalendar({
       timeZone: 'UTC',
-      eventAfterAllRender: function() {
+      _eventsRendered: function() {
         expectUtcTimezone()
         done()
       }
@@ -75,7 +75,7 @@ describe('timeZone', function() {
   it('receives events correctly when custom timezone', function(done) {
     initCalendar({
       timeZone: 'America/Chicago',
-      eventAfterAllRender: function() {
+      _eventsRendered: function() {
         expectCustomTimezone()
         done()
       }
@@ -100,7 +100,7 @@ describe('timeZone', function() {
 
     initCalendar({
       timeZone: 'local',
-      eventAfterAllRender: function() {
+      _eventsRendered: function() {
         callCnt++
         if (callCnt === 1) {
 

+ 2 - 2
tests/automated/lib/dnd-resize-utils.js

@@ -14,7 +14,7 @@ export function testEventDrag(options, dropDate, expectSuccess, callback, eventC
   var eventsRendered = false
 
   options.editable = true
-  options.eventAfterAllRender = function() {
+  options._eventsRendered = function() {
     var calendar = currentCalendar
     var isDraggingExternal = false
     var dayEl
@@ -107,7 +107,7 @@ export function testEventResize(options, resizeDate, expectSuccess, callback, ev
   var eventsRendered = false
 
   options.editable = true
-  options.eventAfterAllRender = function() {
+  options._eventsRendered = function() {
     var calendar = currentCalendar
     var lastDayEl
     var lastSlatIndex

+ 1 - 1
tests/automated/view-type/changeView.js

@@ -37,7 +37,7 @@ describe('changeView', function() {
 
       initCalendar({
         defaultView: 'month',
-        eventAfterAllRender: function(arg) {
+        _eventsRendered: function(arg) {
           var view = currentCalendar.view
 
           renderCalls++

+ 4 - 4
tests/manual/slot_event_overlap.html

@@ -23,7 +23,7 @@
       month: 6, // July
       date: 31,
       events: 'slot_event_overlap.json',
-      eventAfterAllRender: function() {
+      _eventsRendered: function() {
         testOverlap($('#calendar'), true, false);
       }
     });
@@ -42,7 +42,7 @@
       date: 31,
       events: 'slot_event_overlap.json',
       slotEventOverlap: false,
-      eventAfterAllRender: function() {
+      _eventsRendered: function() {
         testOverlap($('#calendar-nooverlap'), false, false);
       }
     });
@@ -61,7 +61,7 @@
       date: 31,
       events: 'slot_event_overlap.json',
       isRTL: true,
-      eventAfterAllRender: function() {
+      _eventsRendered: function() {
         testOverlap($('#calendar-rtl'), true, true);
       }
     });
@@ -81,7 +81,7 @@
       events: 'slot_event_overlap.json',
       isRTL: true,
       slotEventOverlap: false,
-      eventAfterAllRender: function() {
+      _eventsRendered: function() {
         testOverlap($('#calendar-rtl-nooverlap'), false, true);
       }
     });

+ 2 - 2
tests/manual/triggers.html

@@ -43,7 +43,7 @@
         //console.log(this);
       },
 
-      eventAfterAllRender: function(view) {
+      _eventsRendered: function(view) {
         console.log('all rendered', view);
       },
 
@@ -154,7 +154,7 @@
         //console.log(this);
       },
 
-      /* for testing eventAfterAllRender
+      /* for testing _eventsRendered
       events: {
         url: "http://www.google.com/calendar/feeds/usa__en%40holiday.calendar.google.com/public/basic",
         editable: true,

+ 2 - 2
tests/manual/triggers_view.html

@@ -37,8 +37,8 @@
         }
       },
 
-      eventAfterAllRender: function(view) {
-        console.log('eventAfterAllRender');
+      _eventsRendered: function(view) {
+        console.log('_eventsRendered');
         if (verbose) {
           console.log(' this', this);
           console.log(' view', view);