فهرست منبع

eventAfterRender -> eventRendered

Adam Shaw 7 سال پیش
والد
کامیت
7674204a59

+ 2 - 2
src/basic/DayGrid.ts

@@ -659,7 +659,7 @@ export default class DayGrid extends DateComponent {
         this.segPopoverTile.eventRenderer.rangeUpdated()
         this.segPopoverTile.eventRenderer.renderSegs(segs)
         this.segPopoverTile.renderedFlags.events = true // so unrendering works
-        this.segPopoverTile.triggerRenderedSegs(segs) // for eventAfterRender
+        this.segPopoverTile.triggerRenderedSegs(segs) // for eventRendered
       },
       hide: () => {
         this.segPopoverTile.removeElement()
@@ -679,7 +679,7 @@ export default class DayGrid extends DateComponent {
     this.segPopoverTile = new DayTile(this.view, this.getCellDate(row, col))
     this.segPopover = new Popover(options)
     this.segPopover.show()
-    this.getCalendar().releaseAfterSizingTriggers() // hack for eventAfterRender
+    this.getCalendar().releaseAfterSizingTriggers() // hack for eventRendered
   }
 
 

+ 2 - 2
src/component/DateComponent.ts

@@ -271,11 +271,11 @@ export default abstract class DateComponent extends Component {
 
 
   triggerRenderedSegs(segs: Seg[], isMirrors: boolean = false) {
-    if (this.hasPublicHandlers('eventAfterRender')) {
+    if (this.hasPublicHandlers('eventRendered')) {
       let calendar = this.getCalendar()
 
       for (let seg of segs) {
-        this.publiclyTriggerAfterSizing('eventAfterRender', [
+        this.publiclyTriggerAfterSizing('eventRendered', [
           {
             event: new EventApi(
               calendar,

+ 1 - 1
src/types/input-types.ts

@@ -186,7 +186,7 @@ export interface OptionsInputBase {
   eventDataTransform?(eventData: any): EventInput
   loading?(isLoading: boolean, view: View): void
   eventRender?(arg: { event: EventApi, el: HTMLElement, view: View }): void
-  eventAfterRender?(arg: { event: EventApi, el: HTMLElement, view: View }): void
+  eventRendered?(arg: { event: EventApi, el: HTMLElement, view: View }): void
   eventAfterAllRender?(arg: { view: View }): void
   eventDestroy?(arg: { event: EventApi, el: HTMLElement, view: View }): void
   eventDragStart?(arg: { event: EventApi, el: HTMLElement, jsEvent: MouseEvent, view: View }): void

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

@@ -384,34 +384,34 @@ describe('eventLimit popover', function() {
         { title: 'event4', start: '2014-07-29', className: 'event4' }
       ],
       eventRender: function() {},
-      eventAfterRender: function() {},
+      eventRendered: function() {},
       eventAfterAllRender: function() {},
       eventDestroy: function() {}
     }
 
     spyOn(options, 'eventRender')
-    spyOn(options, 'eventAfterRender')
+    spyOn(options, 'eventRendered')
     spyOn(options, 'eventAfterAllRender')
     spyOn(options, 'eventDestroy')
 
     initCalendar(options)
 
     expect(options.eventRender.calls.count()).toBe(4)
-    expect(options.eventAfterRender.calls.count()).toBe(4)
+    expect(options.eventRendered.calls.count()).toBe(4)
     expect(options.eventAfterAllRender.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.eventAfterRender.calls.count()).toBe(8) // +4
+    expect(options.eventRendered.calls.count()).toBe(8) // +4
     expect(options.eventAfterAllRender.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.eventAfterRender.calls.count()).toBe(8)
+    expect(options.eventRendered.calls.count()).toBe(8)
     expect(options.eventAfterAllRender.calls.count()).toBe(1)
     expect(options.eventDestroy.calls.count()).toBe(4) // +4
   })

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

@@ -7,13 +7,13 @@ describe('selectMirror', function() {
     selectMirror: true
   })
 
-  it('goes through eventRender and eventAfterRender', function() {
+  it('goes through eventRender and eventRendered', function() {
     initCalendar({
       eventRender(arg) {
         expect(arg.isMirror).toBe(true)
         $(arg.el).addClass('eventDidRender')
       },
-      eventAfterRender(arg) {
+      eventRendered(arg) {
         expect(arg.isMirror).toBe(true)
         $(arg.el).addClass('eventDidPosition')
       }

+ 1 - 1
tests/manual/triggers.html

@@ -83,7 +83,7 @@
           //console.log('renderEvent (' + event.title + ') - ' + view.title);
         }
       },
-      eventAfterRender: function(event, element, view) {
+      eventRendered: function(event, element, view) {
         //console.log('after render for "' + event.title + '":');
         //console.log(element);
       },