فهرست منبع

viewRender/viewDestroy -> datesRender/datesDestroy

Adam Shaw 7 سال پیش
والد
کامیت
7819e512d3

+ 2 - 2
src/View.ts

@@ -201,7 +201,7 @@ export default abstract class View extends DateComponent {
 
 
   triggerRenderedDates() {
-    this.publiclyTriggerAfterSizing('viewRender', [
+    this.publiclyTriggerAfterSizing('datesRender', [
       {
         view: this,
         el: this.el
@@ -211,7 +211,7 @@ export default abstract class View extends DateComponent {
 
 
   triggerWillRemoveDates() {
-    this.publiclyTrigger('viewDestroy', [
+    this.publiclyTrigger('datesDestroy', [
       {
         view: this,
         el: this.el

+ 1 - 1
src/list/ListView.ts

@@ -96,7 +96,7 @@ export default class ListView extends View {
 
     // all real rendering happens in EventRenderer
 
-    super.renderDates(dateProfile) // important for firing viewRender
+    super.renderDates(dateProfile) // important for firing datesRender
   }
 
 

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

@@ -173,8 +173,8 @@ export interface OptionsInputBase {
   droppable?: boolean
   dropAccept?: string | ((draggable: any) => boolean)
 
-  viewRender?(arg: { view: View, el: HTMLElement }): void
-  viewDestroy?(arg: { view: View, el: HTMLElement }): void
+  datesRender?(arg: { view: View, el: HTMLElement }): void
+  datesDestroy?(arg: { view: View, el: HTMLElement }): void
   dayRender?(arg: { view: View, date: Date, isAllDay: boolean, el: HTMLElement }): void
   windowResize?(view: View): void
   dateClick?(arg: { date: Date, isAllDay: boolean, resource: any, el: HTMLElement, jsEvent: MouseEvent, view: View }): void // resource for Scheduler

+ 3 - 3
tests/automated/legacy/View.js

@@ -16,12 +16,12 @@ describe('View object', function() {
       expect(view.title).toBe('January 2015')
     })
 
-    it('is available in the viewRender callback', function() {
-      var viewRenderSpy = spyOnCalendarCallback('viewRender', function(arg) {
+    it('is available in the datesRender callback', function() {
+      var datesRenderSpy = spyOnCalendarCallback('datesRender', function(arg) {
         expect(arg.view.title).toBe('January 2015')
       })
       initCalendar()
-      expect(viewRenderSpy).toHaveBeenCalled()
+      expect(datesRenderSpy).toHaveBeenCalled()
     })
 
   })

+ 10 - 10
tests/automated/legacy/viewDestroy.js

@@ -1,4 +1,4 @@
-describe('viewDestroy', function() {
+describe('datesDestroy', function() {
 
   pushOptions({
     defaultDate: '2015-02-20'
@@ -20,17 +20,17 @@ describe('viewDestroy', function() {
 
   function defineTests() {
     it('fires before the view is unrendered, with correct arguments', function(done) {
-      var viewRenderCalls = 0
-      var viewDestroyCalls = 0
+      var datesRenderCalls = 0
+      var datesDestroyCalls = 0
       initCalendar({
-        viewRender: function() {
-          ++viewRenderCalls
+        datesRender: function() {
+          ++datesRenderCalls
         },
-        viewDestroy: function(arg) {
-          if (++viewDestroyCalls === 1) { // because done() calls destroy
+        datesDestroy: function(arg) {
+          if (++datesDestroyCalls === 1) { // because done() calls destroy
 
-            // the viewDestroy should be called before the next viewRender
-            expect(viewRenderCalls).toBe(1)
+            // the datesDestroy should be called before the next datesRender
+            expect(datesRenderCalls).toBe(1)
 
             var viewObj = currentCalendar.getView()
             var viewEl = $('.fc-view', currentCalendar.el)
@@ -42,7 +42,7 @@ describe('viewDestroy', function() {
           }
         }
       })
-      currentCalendar.next() // trigger viewDestroy/viewRender
+      currentCalendar.next() // trigger datesDestroy/datesRender
     })
   }
 })

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

@@ -1,4 +1,4 @@
-describe('viewRender', function() {
+describe('datesRender', function() {
 
   pushOptions({
     defaultDate: '2015-02-20'
@@ -22,7 +22,7 @@ describe('viewRender', function() {
 
     it('fires after the view is rendered, with correct arguments', function(done) {
       initCalendar({
-        viewRender: function(arg) {
+        datesRender: function(arg) {
           var viewObj = currentCalendar.getView()
           var viewEl = $('.fc-view', currentCalendar.el)
 

+ 1 - 1
tests/automated/view-dates/next.js

@@ -115,7 +115,7 @@ describe('next', function() {
           var called
 
           initCalendar({
-            viewRender: function() {
+            datesRender: function() {
               called = true
             }
           })

+ 6 - 6
tests/manual/triggers_view.html

@@ -27,9 +27,9 @@
       editable: true,
       selectable: true,
 
-      viewRender: function(view, element) {
-        console.log('viewRender');
-        //alert('viewRender');
+      datesRender: function(view, element) {
+        console.log('datesRender');
+        //alert('datesRender');
         if (verbose) {
           console.log(' this', this);
           console.log(' view', view);
@@ -45,9 +45,9 @@
         }
       },
 
-      viewDestroy: function(view, element) {
-        console.log('viewDestroy');
-        //alert('viewDestroy');
+      datesDestroy: function(view, element) {
+        console.log('datesDestroy');
+        //alert('datesDestroy');
         if (verbose) {
           console.log(' this', this);
           console.log(' view', view);