From 638f08b12576a262154ead14180ef854b161e6e2 Mon Sep 17 00:00:00 2001 From: Edward Date: Thu, 25 Sep 2014 12:56:13 +0800 Subject: [PATCH] Roo/bootstrap/Calendar.js --- Roo/bootstrap/Calendar.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Roo/bootstrap/Calendar.js b/Roo/bootstrap/Calendar.js index 7c81f00afc..ebe6b62889 100644 --- a/Roo/bootstrap/Calendar.js +++ b/Roo/bootstrap/Calendar.js @@ -784,21 +784,20 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component, { var ev = c.events; - var r = 0; + var r = 4; if(c.row != c.events.length){ - r = 4 - (c.row - c.events.length); + r = 4 - (4 - (c.row - c.events.length)); } - c.events = ev.slice(0, r); c.more = ev.slice(r); - c.row = r + c.events.length + 1; - if(c.more.length && c.more.length == 1){ c.events.push(c.more.pop()); } + c.row = (c.row - ev.length) + c.events.length + ((c.more.length) ? 1 : 0); + }); // for (var e = 0; e < this.calevents.length; e++) { -- 2.39.2