projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
36b3849
)
Merge branch 'master' of http://git.roojs.com/roojs1
author
Alan Knowles
<alan@roojs.com>
Thu, 25 Sep 2014 04:49:34 +0000
(12:49 +0800)
committer
Alan Knowles
<alan@roojs.com>
Thu, 25 Sep 2014 04:49:34 +0000
(12:49 +0800)
Roo/bootstrap/Calendar.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Calendar.js
b/Roo/bootstrap/Calendar.js
index
44eb8ef
..
3862ff1
100644
(file)
--- a/
Roo/bootstrap/Calendar.js
+++ b/
Roo/bootstrap/Calendar.js
@@
-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());