allow string based values for comboboxarray

[roojs1] / Roo / grid / Calendar.js

diff --git a/Roo/grid/Calendar.js b/Roo/grid/Calendar.js
index b99e6c4..43cb036 100644 (file)
--- a/Roo/grid/Calendar.js
+++ b/Roo/grid/Calendar.js
@@ -779,12 +779,7 @@ Roo.extend(Roo.grid.Calendar, Roo.grid.Grid, {
         });
         
         this.eventStore.each(function(e) {
-            Roo.each(e.els, function(el) {
-                el.un('mouseenter' ,this.onEventEnter, this);
-                el.un('mouseleave' ,this.onEventLeave, this);
-                el.remove();
-            },this);
-            e.els = [];
+            this.clearEvent(e);
         },this);
         
     },
@@ -792,14 +787,14 @@ Roo.extend(Roo.grid.Calendar, Roo.grid.Grid, {
     clearEvent : function(ev)
     {
         if (ev.els) {
-            Roo.each(e.els, function(el) {
+            Roo.each(ev.els, function(el) {
                 el.un('mouseenter' ,this.onEventEnter, this);
                 el.un('mouseleave' ,this.onEventLeave, this);
                 el.remove();
             },this);
-            e.els = [];
+            ev.els = [];
         }
-    }
+    },
     
     
     renderEvent : function(ev,ctr) {
@@ -807,15 +802,10 @@ Roo.extend(Roo.grid.Calendar, Roo.grid.Grid, {
              ctr = this.view.el.select('.fc-event-container',true).first();
         }
         
-        if (ev.els) {
-            Roo.each(ev.els, function(el) {
-                el.un('mouseenter' ,this.onEventEnter, this);
-                el.un('mouseleave' ,this.onEventLeave, this);
-                el.remove();
-            },this);
-            ev.els = [];
+         
+        this.clearEvent(ev);
             //code
-        }
+       
         
         
         ev.els = [];
@@ -833,7 +823,7 @@ Roo.extend(Roo.grid.Calendar, Roo.grid.Grid, {
                 cls += ' fc-event-end';
             }
             
-            Roo.log(ev.data);
+            //Roo.log(ev.data);
             // how many rows should it span..
             var cg = this.eventTmpl.append(ctr,Roo.apply({
                 fccls : cls
@@ -876,7 +866,7 @@ Roo.extend(Roo.grid.Calendar, Roo.grid.Grid, {
         
         
         this.cells.each(function(c) {
-            Roo.log(c.select('.fc-day-content div',true).first());
+            //Roo.log(c.select('.fc-day-content div',true).first());
             c.select('.fc-day-content div',true).first().setHeight(Math.max(34, (c.rows || 1) * 20));
         });