fix docs

[roojs1] / Roo / bootstrap / Calendar.js

diff --git a/Roo/bootstrap/Calendar.js b/Roo/bootstrap/Calendar.js
index ae1ffc3..36afb89 100644 (file)
--- a/Roo/bootstrap/Calendar.js
+++ b/Roo/bootstrap/Calendar.js
@@ -198,7 +198,7 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
         };
         var cal_rows = function() {
             
-            var ret = []
+            var ret = [];
             for (var r = 0; r < 6; r++) {
                 var row= {
                     tag : 'tr',
@@ -298,7 +298,7 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
                     cn: [
                         {
                             tag: "img",
-                            src: rootURL + '/roojs1/images/ux/lightbox/loading.gif'
+                            src: Roo.rootURL + '/images/ux/lightbox/loading.gif' 
                         },
                         {
                             tag: "span",
@@ -308,7 +308,7 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
                     ]
                 }
             ]
-        }
+        };
         this.maskEl = Roo.DomHelper.append(this.el.select('.fc-content', true).first(), mark, true);
         
         var size = this.el.select('.fc-content', true).first().getSize();
@@ -652,17 +652,6 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
         
         cells[0].events.push(ev);
         
-//        if((typeof(cells[0].events) == 'undefined')){
-//            cells[0].events = [];
-//        }
-//        
-//        cells[0].events.push(ev);
-//        ev.rendered = false;
-//        for (var i = 0; i < cells.length;i++) {
-//            cells[i].rows = Math.max(cells[i].rows || 0 , ev.row + 1 );
-//            
-//        }
-        
         this.calevents.push(ev);
     },
     
@@ -693,87 +682,7 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
     },
     
     renderEvents: function()
-    {  
-//        for (var e = 0; e < this.calevents.length; e++) {
-//            
-//            var ev = this.calevents[e];
-//            var cells = ev.cells;
-//            var rows = ev.rows;
-//            
-//            for (var j = 0; j < cells.length; j++){
-//            
-//                if(!cells[j].more.length){
-//                    cells[j].row++;
-//                }
-//                if(cells[j].row > 3){
-//                    cells[j].more.push(ev);
-//                    continue;
-//                }
-//                
-//                cells[j].events.push(ev);
-//            }
-//        }
-            
-//            for (var i = 0; i < rows.length; i++){
-//                // how many rows should it span..
-//
-//                var  cfg = {
-//                    cls : 'roo-dynamic fc-event fc-event-hori fc-event-draggable ui-draggable',
-//                    style : 'position: absolute', // left: 387px; width: 121px; top: 359px;
-//
-//                    unselectable : "on",
-//                    cn : [
-//                        {
-//                            cls: 'fc-event-inner',
-//                            cn : [
-////                                {
-////                                  tag:'span',
-////                                  cls: 'fc-event-time',
-////                                  html : cells.length > 1 ? '' : ev.time
-////                                },
-//                                {
-//                                  tag:'span',
-//                                  cls: 'fc-event-title',
-//                                  html : String.format('{0}', ev.title)
-//                                }
-//
-//
-//                            ]
-//                        },
-//                        {
-//                            cls: 'ui-resizable-handle ui-resizable-e',
-//                            html : '&nbsp;&nbsp;&nbsp'
-//                        }
-//
-//                    ]
-//                };
-//
-//                if (i == 0) {
-//                    cfg.cls += ' fc-event-start';
-//                }
-//                if ((i+1) == rows.length) {
-//                    cfg.cls += ' fc-event-end';
-//                }
-//
-//                var ctr = this.el.select('.fc-event-container',true).first();
-//                var cg = ctr.createChild(cfg);
-//
-//                var sbox = rows[i].start.select('.fc-day-content',true).first().getBox();
-//                var ebox = rows[i].end.select('.fc-day-content',true).first().getBox();
-//
-//                cg.setXY([sbox.x +2, sbox.y +(e * 20)]);    
-//                cg.setWidth(ebox.right - sbox.x -2);
-//
-//                cg.on('mouseenter' ,this.onEventEnter, this, ev);
-//                cg.on('mouseleave' ,this.onEventLeave, this, ev);
-//                cg.on('click', this.onEventClick, this, ev);
-//
-//                ev.els.push(cg);
-//
-//                
-//            }
-//        }
-        
+    {   
         var _this = this;
         
         this.cells.each(function(c) {
@@ -784,38 +693,22 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
             
             var ev = c.events;
             
-            var r = c.row - ev.length;
-            
-            c.events = ev.slice(0, 4 - r);
-            c.more = ev.slice(4 - r);
+            var r = 4;
+            if(c.row != c.events.length){
+                r = 4 - (4 - (c.row - c.events.length));
+            }
             
-            c.row = c.events.length + 1;
+            c.events = ev.slice(0, r);
+            c.more = ev.slice(r);
             
             if(c.more.length && c.more.length == 1){
                 c.events.push(c.more.pop());
             }
             
+            c.row = (c.row - ev.length) + c.events.length + ((c.more.length) ? 1 : 0);
+            
         });
             
-//        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) {
             
             c.select('.fc-day-content div',true).first().setHeight(Math.max(34, c.row * 20));
@@ -964,7 +857,7 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
             var cfg = {
                 cls : 'fc-event-hori fc-event-draggable',
                 html : m.title
-            }
+            };
             var cg = ctr.createChild(cfg);
             
             cg.on('click', _this.onEventClick, _this, m);