projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0c24a37
)
Roo/bootstrap/Calendar.js
author
Edward
<edward@roojs.com>
Thu, 25 Sep 2014 04:13:22 +0000
(12:13 +0800)
committer
Edward
<edward@roojs.com>
Thu, 25 Sep 2014 04:13:22 +0000
(12:13 +0800)
Roo/bootstrap/Calendar.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Calendar.js
b/Roo/bootstrap/Calendar.js
index
ded25d1
..
c8fd33a
100644
(file)
--- a/
Roo/bootstrap/Calendar.js
+++ b/
Roo/bootstrap/Calendar.js
@@
-802,6
+802,8
@@
Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component, {
c.events.push(c.more.pop());
}
+ c.row = c.events.length;
+
});
// for (var e = 0; e < this.calevents.length; e++) {
@@
-824,9
+826,6
@@
Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component, {
// }
//
this.cells.each(function(c) {
- if(c.more.length && c.more.length == 1){
- c.rows.push(c.more.pop());
- }
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));