projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
245db36
)
Roo/bootstrap/Calendar.js
author
Edward
<edward@roojs.com>
Thu, 25 Sep 2014 04:33:56 +0000
(12:33 +0800)
committer
Edward
<edward@roojs.com>
Thu, 25 Sep 2014 04:33:56 +0000
(12:33 +0800)
Roo/bootstrap/Calendar.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Calendar.js
b/Roo/bootstrap/Calendar.js
index
ac44a71
..
a60c6c9
100644
(file)
--- a/
Roo/bootstrap/Calendar.js
+++ b/
Roo/bootstrap/Calendar.js
@@
-777,24
+777,15
@@
Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component, {
var _this = this;
this.cells.each(function(c) {
- if(c.inhertance > 4){
- c.more = c.events;
- c.events = [];
- return;
- }
- var totalRow = c.inhertance + c.row;
-
- if(totalRow < 5){
+ if(c.row < 5){
return;
}
- var moreRow = 4 - c.inhertance;
-
var ev = c.events;
- c.events = ev.slice(0,
moreRow
);
- c.more = ev.slice(
moreRow
);
+ c.events = ev.slice(0,
4
);
+ c.more = ev.slice(
4
);
c.row = c.events.length + 1;