Roo/bootstrap/Calendar.js
authorEdward <edward@roojs.com>
Thu, 25 Sep 2014 04:49:27 +0000 (12:49 +0800)
committerEdward <edward@roojs.com>
Thu, 25 Sep 2014 04:49:27 +0000 (12:49 +0800)
Roo/bootstrap/Calendar.js

index 44eb8ef..3862ff1 100644 (file)
@@ -784,10 +784,12 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
             
             var ev = c.events;
             
-            c.events = ev.slice(0, 4);
-            c.more = ev.slice(4);
+            var r = 4 - c.row - c.events.length;
             
-            c.row = c.events.length + 1;
+            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());