allow string based values for comboboxarray

[roojs1] / Roo / calendar / View.js

diff --git a/Roo/calendar/View.js b/Roo/calendar/View.js
index ba006ce..67a62c8 100644 (file)
--- a/Roo/calendar/View.js
+++ b/Roo/calendar/View.js
@@ -675,7 +675,7 @@ Roo.extend(Roo.calendar.View, Roo.BoxComponent,  {
                 
                 var  cfg = {
                     cls : 'roo-dynamic fc-event fc-event-hori fc-event-draggable ui-draggable',
-//                    style : 'position: absolute', // left: 387px; width: 121px; top: 359px;
+                    style : 'position: absolute', // left: 387px; width: 121px; top: 359px;
                     
                     unselectable : "on",
                     cn : [
@@ -706,6 +706,7 @@ Roo.extend(Roo.calendar.View, Roo.BoxComponent,  {
                 if (i == 0) {
                     cfg.cls += ' fc-event-start';
                 }
+                
                 if ((i+1) == rows.length) {
                     cfg.cls += ' fc-event-end';
                 }
@@ -713,26 +714,23 @@ Roo.extend(Roo.calendar.View, Roo.BoxComponent,  {
 //                var ctr = this.el.select('.fc-event-container',true).first();
                 var cg = startCell.createChild(cfg);
                 
-                Roo.log(rows[i]);
-                Roo.log(cg);
-                cg.setStyle('margin-top', rows[i].start.rows * 20);
-                
                 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 sbox = rows[i].start.select('.fc-day-content',true).first().getBox();
-//                var ebox = rows[i].end.select('.fc-day-content',true).first().getBox();
+                var sbox = rows[i].start.select('.fc-day-content',true).first().getBox();
+                var ebox = rows[i].end.select('.fc-day-content',true).first().getBox();
 //                //Roo.log(cg);
-//                cg.setXY([sbox.x +2, sbox.y +(ev.row * 20)]);   
-                
-                var boxes = Math.ceil((rows[i].end.dateValue - rows[i].start.dateValue) / 86400000)  || 1;
+                cg.setXY([sbox.x +2, sbox.y +(ev.row * 20)]);   
+//                Roo.log(rows[i]);
+                var boxes = Math.ceil((rows[i].end.dateValue - rows[i].start.dateValue) / 86400000) + 1;
 //                cg.setWidth(ebox.right - sbox.x -2);
 //                Roo.log(boxes);
-
                 cg.setWidth(134 * boxes);
+//                cg.setWidth(134);
+                
             }