Adam Shaw 7 yıl önce
ebeveyn
işleme
f0af585c90
2 değiştirilmiş dosya ile 15 ekleme ve 7 silme
  1. 10 4
      src/agenda/AgendaView.ts
  2. 5 3
      src/basic/BasicView.ts

+ 10 - 4
src/agenda/AgendaView.ts

@@ -20,12 +20,12 @@ export default class AgendaView extends AbstractAgendaView {
   buildDayTable = reselector(buildDayTable)
   buildDayTable = reselector(buildDayTable)
 
 
   constructor(
   constructor(
-    context: ComponentContext,
+    _context: ComponentContext,
     viewSpec: ViewSpec,
     viewSpec: ViewSpec,
     dateProfileGenerator: DateProfileGenerator,
     dateProfileGenerator: DateProfileGenerator,
     parentEl: HTMLElement
     parentEl: HTMLElement
   ) {
   ) {
-    super(context, viewSpec, dateProfileGenerator, parentEl)
+    super(_context, viewSpec, dateProfileGenerator, parentEl)
 
 
     if (this.opt('columnHeader')) {
     if (this.opt('columnHeader')) {
       this.header = new DayHeader(
       this.header = new DayHeader(
@@ -34,10 +34,10 @@ export default class AgendaView extends AbstractAgendaView {
       )
       )
     }
     }
 
 
-    this.simpleTimeGrid = new SimpleTimeGrid(context, this.timeGrid)
+    this.simpleTimeGrid = new SimpleTimeGrid(this.context, this.timeGrid)
 
 
     if (this.dayGrid) {
     if (this.dayGrid) {
-      this.simpleDayGrid = new SimpleDayGrid(context, this.dayGrid)
+      this.simpleDayGrid = new SimpleDayGrid(this.context, this.dayGrid)
     }
     }
   }
   }
 
 
@@ -47,6 +47,12 @@ export default class AgendaView extends AbstractAgendaView {
     if (this.header) {
     if (this.header) {
       this.header.destroy()
       this.header.destroy()
     }
     }
+
+    this.simpleTimeGrid.destroy()
+
+    if (this.simpleDayGrid) {
+      this.simpleDayGrid.destroy()
+    }
   }
   }
 
 
   render(props: ViewProps) {
   render(props: ViewProps) {

+ 5 - 3
src/basic/BasicView.ts

@@ -17,8 +17,8 @@ export default class BasicView extends AbstractBasicView {
 
 
   buildDayTable = reselector(buildDayTable)
   buildDayTable = reselector(buildDayTable)
 
 
-  constructor(context: ComponentContext, viewSpec: ViewSpec, dateProfileGenerator: DateProfileGenerator, parentEl: HTMLElement) {
-    super(context, viewSpec, dateProfileGenerator, parentEl)
+  constructor(_context: ComponentContext, viewSpec: ViewSpec, dateProfileGenerator: DateProfileGenerator, parentEl: HTMLElement) {
+    super(_context, viewSpec, dateProfileGenerator, parentEl)
 
 
     if (this.opt('columnHeader')) {
     if (this.opt('columnHeader')) {
       this.header = new DayHeader(
       this.header = new DayHeader(
@@ -27,7 +27,7 @@ export default class BasicView extends AbstractBasicView {
       )
       )
     }
     }
 
 
-    this.simpleDayGrid = new SimpleDayGrid(context, this.dayGrid)
+    this.simpleDayGrid = new SimpleDayGrid(this.context, this.dayGrid)
   }
   }
 
 
   destroy() {
   destroy() {
@@ -36,6 +36,8 @@ export default class BasicView extends AbstractBasicView {
     if (this.header) {
     if (this.header) {
       this.header.destroy()
       this.header.destroy()
     }
     }
+
+    this.simpleDayGrid.destroy()
   }
   }
 
 
   render(props: ViewProps) {
   render(props: ViewProps) {