Browse Source

clean some stuff out

Adam Shaw 7 years ago
parent
commit
19ae8f7e8a
3 changed files with 4 additions and 39 deletions
  1. 2 2
      src/Calendar.ts
  2. 2 20
      src/View.ts
  3. 0 17
      src/component/DateComponent.ts

+ 2 - 2
src/Calendar.ts

@@ -376,7 +376,7 @@ export default class Calendar {
   requestRerender(forceFlags: RenderForceFlags = {}) {
     if (forceFlags === true || !this.rerenderFlags) {
       this.rerenderFlags = forceFlags // true, or the first object
-    } else if (this.rerenderFlags) {
+    } else {
       assignTo(this.rerenderFlags, forceFlags) // merge the objects
     }
 
@@ -532,7 +532,7 @@ export default class Calendar {
       businessHoursDef: renderedView.opt('businessHours')
     }, forceFlags)
 
-    if (this.updateViewSize()) { // success? // TODO: respect isSizeDirty
+    if (this.updateViewSize()) { // success?
       renderedView.popScroll()
     }
   }

+ 2 - 20
src/View.ts

@@ -79,7 +79,6 @@ export default abstract class View extends InteractiveDateComponent {
 
     this.initHiddenDays()
     this.dateProfileGenerator = new this.dateProfileGeneratorClass(this)
-    this.bindBaseRenderHandlers()
     this.eventOrderSpecs = parseFieldSpecs(this.opt('eventOrder'))
 
     // legacy
@@ -95,15 +94,6 @@ export default abstract class View extends InteractiveDateComponent {
   }
 
 
-  /* Render Queue
-  ------------------------------------------------------------------------------------------------------------------*/
-
-
-  // given func will auto-bind to `this`
-  whenSizeUpdated(func) {
-  }
-
-
   /* Title and Date Formatting
   ------------------------------------------------------------------------------------------------------------------*/
 
@@ -201,7 +191,6 @@ export default abstract class View extends InteractiveDateComponent {
   // if dateProfile not specified, uses current
   renderDates() {
     super.renderDates()
-    this.trigger('datesRendered')
     this.addScroll({ isDateInit: true })
     this.startNowIndicator() // shouldn't render yet because updateSize will be called soon
   }
@@ -210,12 +199,11 @@ export default abstract class View extends InteractiveDateComponent {
   unrenderDates() {
     this.unselect()
     this.stopNowIndicator()
-    this.trigger('before:datesUnrendered')
     super.unrenderDates()
   }
 
 
-  // "Base" rendering
+  // Triggering
   // -----------------------------------------------------------------------------------------------------------------
 
 
@@ -340,13 +328,7 @@ export default abstract class View extends InteractiveDateComponent {
 
 
   updateSize(totalHeight, isAuto, isResize) {
-
-    if (this['setHeight']) { // for legacy API
-      this['setHeight'](totalHeight, isAuto)
-    } else {
-      super.updateSize(totalHeight, isAuto, isResize)
-    }
-
+    super.updateSize(totalHeight, isAuto, isResize)
     this.updateNowIndicator()
   }
 

+ 0 - 17
src/component/DateComponent.ts

@@ -64,7 +64,6 @@ export default abstract class DateComponent extends Component {
   isEventsRendered: boolean = false
   isDragRendered: boolean = false
   isEventResizeRendered: boolean = false
-  isSizeDirty: boolean = false
   dateProfile: DateProfile
   businessHoursDef: BusinessHourDef
   selection: Selection
@@ -128,8 +127,6 @@ export default abstract class DateComponent extends Component {
   }
 
 
-  // TODO: only do if isInDom?
-  // TODO: make part of Component, along with children/batch-render system?
   updateSize(totalHeight, isAuto, isResize) {
     this.callChildren('updateSize', arguments)
   }
@@ -188,37 +185,30 @@ export default abstract class DateComponent extends Component {
     if (isEventResizeDirty && this.isEventResizeRendered) {
       this.unrenderEventResize()
       this.isEventResizeRendered = false
-      this.isSizeDirty = false
     }
     if (isDragDirty && this.isDragRendered) {
       this.unrenderDrag()
       this.isDragRendered = false
-      this.isSizeDirty = true
     }
     if (isEventsDirty && this.isEventsRendered) {
       this.unrenderEvents()
       this.isEventsRendered = false
-      this.isSizeDirty = true
     }
     if (isSelectionDirty && this.isSelectionRendered) {
       this.unrenderSelection()
       this.isSelectionRendered = false
-      this.isSizeDirty = true
     }
     if (isBusinessHoursDirty && this.isBusinessHoursRendered) {
       this.unrenderBusinessHours()
       this.isBusinessHoursRendered = false
-      this.isSizeDirty = true
     }
     if (isDatesDirty && this.isDatesRendered) {
       this.unrenderDates()
       this.isDatesRendered = false
-      this.isSizeDirty = true
     }
     if (isSkeletonDirty && this.isSkeletonRendered) {
       this.unrenderSkeleton()
       this.isSkeletonRendered = false
-      this.isSizeDirty = true
     }
 
     assignTo(this, renderState)
@@ -227,39 +217,32 @@ export default abstract class DateComponent extends Component {
     if ((isSkeletonDirty || !this.isSkeletonRendered) || !this.isSkeletonRendered) {
       this.renderSkeleton()
       this.isSkeletonRendered = true
-      this.isSizeDirty = true
     }
     if ((isDatesDirty || !this.isDatesRendered) && renderState.dateProfile) {
       this.renderDates() // pass in dateProfile too?
       this.isDatesRendered = true
-      this.isSizeDirty = true
     }
     if ((isBusinessHoursDirty || !this.isBusinessHoursRendered) && renderState.businessHoursDef && this.isDatesRendered) {
       this.renderBusinessHours(renderState.businessHoursDef)
       this.isBusinessHoursRendered = true
-      this.isSizeDirty = true
     }
     if ((isSelectionDirty || !this.isSelectionRendered) && renderState.selection && this.isDatesRendered) {
       this.renderSelection(renderState.selection)
       this.isSelectionRendered = true
-      this.isSizeDirty = true
     }
     if ((isEventsDirty || !this.isEventsRendered) && renderState.eventStore && this.isDatesRendered) {
       this.renderEvents(renderState.eventStore)
       this.isEventsRendered = true
-      this.isSizeDirty = true
     }
     if ((isDragDirty || !this.isDragRendered) && renderState.dragState && this.isDatesRendered) {
       let { dragState } = renderState
       this.renderDrag(dragState.eventStore, dragState.origSeg, dragState.isTouch)
       this.isDragRendered = true
-      this.isSizeDirty = true
     }
     if ((isEventResizeDirty || !this.isEventResizeRendered) && renderState.eventResizeState && this.isDatesRendered) {
       let { eventResizeState } = renderState
       this.renderEventResize(eventResizeState.eventStore, eventResizeState.origSeg, eventResizeState.isTouch)
       this.isEventResizeRendered = true
-      this.isSizeDirty = true
     }
 
     this.renderChildren(renderState, forceFlags)