projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
445985a
)
Roo/bootstrap/Calendar.js
author
Edward
<edward@roojs.com>
Thu, 25 Sep 2014 04:07:43 +0000
(12:07 +0800)
committer
Edward
<edward@roojs.com>
Thu, 25 Sep 2014 04:07:43 +0000
(12:07 +0800)
Roo/bootstrap/Calendar.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Calendar.js
b/Roo/bootstrap/Calendar.js
index
e5aa888
..
4c31f50
100644
(file)
--- a/
Roo/bootstrap/Calendar.js
+++ b/
Roo/bootstrap/Calendar.js
@@
-779,9
+779,27
@@
Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component, {
var _this = this;
this.cells.each(function(c) {
- if(c.row > 4){
+ if(c.inhertance > 4){
+ c.more = c.events;
+ c.events = [];
+ return;
+ }
+
+ var totalRow = c.inhertance + c.row;
+
+ if(totalRow < 5){
+ return;
+ }
+
+ var moreRow = 3 - c.inhertance;
+
+ c.events = c.events.slice(0, moreRow);
+ c.more = c.events.slice(moreRow);
+
+ if(c.more.length){
}
+
});
for (var e = 0; e < this.calevents.length; e++) {