projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
878432e
)
Roo/bootstrap/Calendar.js
author
Edward
<edward@roojs.com>
Thu, 6 Mar 2014 09:22:50 +0000
(17:22 +0800)
committer
Edward
<edward@roojs.com>
Thu, 6 Mar 2014 09:22:50 +0000
(17:22 +0800)
Roo/bootstrap/Calendar.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Calendar.js
b/Roo/bootstrap/Calendar.js
index
6d96062
..
49a3b0e
100644
(file)
--- a/
Roo/bootstrap/Calendar.js
+++ b/
Roo/bootstrap/Calendar.js
@@
-596,7
+596,7
@@
Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component, {
var ev = this.calevents[e];
var cells = ev.cells;
var rows = ev.rows;
- var boxHeight = 0;
+
for(var i =0; i < rows.length; i++) {
@@
-653,10
+653,9
@@
Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component, {
cg.setXY([sbox.x +2, sbox.y +(ev.row * 20)]);
cg.setWidth(ebox.right - sbox.x -2);
- boxHeight += cg.getHeight();
+
}
- Roo.log(boxHeight);
- cells[0].select('.fc-day-content div',true).first().setHeight(Math.max(34, boxHeight));
+
}