From d3bf54d327f8c7c2066ceb6ce445d832e8ad5526 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 10 Apr 2014 09:20:10 +0800 Subject: [PATCH] Roo/grid/Calendar.js --- Roo/grid/Calendar.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Roo/grid/Calendar.js b/Roo/grid/Calendar.js index 5d6ca9f201..db12ffdf57 100644 --- a/Roo/grid/Calendar.js +++ b/Roo/grid/Calendar.js @@ -51,6 +51,7 @@ Roo.grid.Calendar = function(container, config){ if (this.eventStore) { this.eventStore= Roo.factory(this.eventStore, Roo.data); this.eventStore.on('load',this.onLoad, this); + this.eventStore.on('beforeload',this.clearEvents, this); } @@ -681,10 +682,10 @@ Roo.extend(Roo.grid.Calendar, Roo.grid.Grid, { return ret; }, - findCells : function(ev) { - var s = ev.start_dt.clone().clearTime().getTime(); + findCells : function(rec) { + var s = rec.data.start_dt.clone().clearTime().getTime(); // Roo.log(s); - var e= ev.end_dt.clone().clearTime().getTime(); + var e= rec.data.end_dt.clone().clearTime().getTime(); // Roo.log(e); var ret = []; this.cells.each(function(c){ @@ -874,9 +875,7 @@ Roo.extend(Roo.grid.Calendar, Roo.grid.Grid, { this.clearEvents(); //Roo.log('calendar onload'); -// - this.calevents = []; - +// if(this.eventStore.getCount() > 0){ -- 2.39.2