projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9d15494
)
Roo/bootstrap/Calendar.js
author
Edward
<edward@roojs.com>
Thu, 25 Sep 2014 03:29:15 +0000
(11:29 +0800)
committer
Edward
<edward@roojs.com>
Thu, 25 Sep 2014 03:29:15 +0000
(11:29 +0800)
Roo/bootstrap/Calendar.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Calendar.js
b/Roo/bootstrap/Calendar.js
index
d7acb8b
..
c738961
100644
(file)
--- a/
Roo/bootstrap/Calendar.js
+++ b/
Roo/bootstrap/Calendar.js
@@
-695,9
+695,15
@@
Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component, {
var rows = ev.rows;
for (var j = 0; j > cells.length; j++){
- if(
cells[i].row
){
-
+ if(
!cells[i].more.length
){
+ cells[i].row++;
}
+ if(cells[i].row > 3){
+ cells[i].more.push(ev);
+ continue;
+ }
+
+ cells[i].events.push(ev);
}
for (var i = 0; i < rows.length; i++){