From 60e9001df9d682802730d51e5de82f5d9d03d63e Mon Sep 17 00:00:00 2001 From: Edward Date: Thu, 25 Sep 2014 12:17:27 +0800 Subject: [PATCH] Roo/bootstrap/Calendar.js --- Roo/bootstrap/Calendar.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Roo/bootstrap/Calendar.js b/Roo/bootstrap/Calendar.js index ad9394a7ae..27cb0cd12a 100644 --- a/Roo/bootstrap/Calendar.js +++ b/Roo/bootstrap/Calendar.js @@ -827,16 +827,11 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component, { // this.cells.each(function(c) { - var r = (c.more.length) ? c.rows.length + 1 : c.rows.length; - c.select('.fc-day-content div',true).first().setHeight(Math.max(34, r * 20)); + c.select('.fc-day-content div',true).first().setHeight(Math.max(34, c.row * 20)); - for (var e = 0; e < c.rows.length; e++){ - var ev = c.rows[e]; - - if(ev.rendered){ - continue; - } + for (var e = 0; e < c.events.length; e++){ + var ev = c.events[e]; var cells = ev.cells; var rows = ev.rows; @@ -898,7 +893,6 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component, { ev.els.push(cg); - ev.rendered = true; } } -- 2.39.2