Roo/bootstrap/Calendar.js
authorEdward <edward@roojs.com>
Thu, 25 Sep 2014 03:48:55 +0000 (11:48 +0800)
committerEdward <edward@roojs.com>
Thu, 25 Sep 2014 03:48:55 +0000 (11:48 +0800)
Roo/bootstrap/Calendar.js

index 14f28de..61dbb5d 100644 (file)
@@ -443,6 +443,7 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
             cell.row = 0;
             cell.events = [];
             cell.more = [];
+            cell.inhertance = 0;
             //Roo.log('set Cell Class');
             cell.title = "";
             var t = d.getTime();
@@ -768,27 +769,33 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
 //            }
 //        }
         
-//        for (var e = 0; e < this.calevents.length; e++) {
-//            
-//            var ev = this.calevents[e];
-//            var cells = ev.cells;
-//            var rows = ev.rows;
-//            
-//            for(var i = 0; i < cells.length; i++){
-//                
-//                var cbox = this.cells.item(this.cells.indexOf(cells[i]));
-//                
-//                if(cells.length < 2 && cbox.rows.length > 3){
-//                    cbox.more.push(ev);
-//                    continue;
-//                }
-//                
-//                cbox.rows.push(ev);
-//            }
-//        }
-//        
         var _this = this;
         
+        this.cells.each(function(c) {
+            if(c.row > 4){
+                
+            }
+        });
+            
+        for (var e = 0; e < this.calevents.length; e++) {
+            
+            var ev = this.calevents[e];
+            var cells = ev.cells;
+            var rows = ev.rows;
+            
+            for(var i = 0; i < cells.length; i++){
+                
+                var cbox = this.cells.item(this.cells.indexOf(cells[i]));
+                
+                if(cells.length < 2 && cbox.rows.length > 3){
+                    cbox.more.push(ev);
+                    continue;
+                }
+                
+                cbox.rows.push(ev);
+            }
+        }
+        
         this.cells.each(function(c) {
             if(c.more.length && c.more.length == 1){
                 c.rows.push(c.more.pop());