projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1214132
)
Roo/bootstrap/Calendar.js
author
Edward
<edward@roojs.com>
Thu, 6 Mar 2014 08:03:35 +0000
(16:03 +0800)
committer
Edward
<edward@roojs.com>
Thu, 6 Mar 2014 08:03:35 +0000
(16:03 +0800)
Roo/bootstrap/Calendar.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Calendar.js
b/Roo/bootstrap/Calendar.js
index
d7fa471
..
9c83e62
100644
(file)
--- a/
Roo/bootstrap/Calendar.js
+++ b/
Roo/bootstrap/Calendar.js
@@
-522,7
+522,7
@@
Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component, {
{
// look for vertical location slot in
var cells = this.findCells(ev);
- Roo.log(cells);
+
ev.row = this.findBestRow(cells);
// work out the location.
@@
-550,6
+550,7
@@
Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component, {
};
}
+
rows.push(crow);
ev.els = [];
ev.rows = rows;
@@
-559,6
+560,10
@@
Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component, {
}
+ if(!crow){
+ return;
+ }
+
this.calevents.push(ev);
},