allow string based values for comboboxarray

[roojs1] / Roo / CalendarPanel.js

diff --git a/Roo/CalendarPanel.js b/Roo/CalendarPanel.js
index 1006dca..1755aa4 100644 (file)
--- a/Roo/CalendarPanel.js
+++ b/Roo/CalendarPanel.js
@@ -40,7 +40,11 @@ Roo.CalendarPanel = function(config){
         //this.footer = Roo.factory(this.footer, Roo);
         
     }
-    this.view = new Roo.calendar.View(config);
+    this.view = new Roo.calendar.View(Roo.apply({
+        skipNavHeader : true,
+        skipMonthHeader : false
+        
+    },config));
     
      
     this.on('activate', function()
@@ -126,7 +130,7 @@ Roo.extend(Roo.CalendarPanel, Roo.ContentPanel, {
         //Roo.bootstrap.Component.superclass.onRender.call(this, ct, position);
         
         
-        var cfg = Roo.apply({},  this.getAutoCreate());
+        var cfg = Roo.apply({},  this.view.getAutoCreate());
         cfg.id = Roo.id();
         
         // fill in the extra attributes 
@@ -152,14 +156,14 @@ Roo.extend(Roo.CalendarPanel, Roo.ContentPanel, {
             cfg.name = this.name;
         }
         
-        this.el = ct.createChild(cfg, position);
+        this.view.el =  ct.createChild(cfg, position);
         
-        if(this.tabIndex !== undefined){
-            this.el.dom.setAttribute('tabIndex', this.tabIndex);
-        }
+        //if(this.tabIndex !== undefined){
+        //    this.el.dom.setAttribute('tabIndex', this.tabIndex);
+        //}
         
         
-        this.initEvents();
+        this.view.initEvents();
         this.fireEvent('rendered');
     }
     
@@ -168,33 +172,4 @@ Roo.extend(Roo.CalendarPanel, Roo.ContentPanel, {
     
 });
 
-
-
-Roo.each([
-    'getAutoCreate',
-    'initEvents',
-    'resize',
-    'showPrevMonth',
-    'showToday',
-    'showNextMonth',
-    'showPrevYear',
-    'showNextYear',
-    'update',
-    'findCell',
-    'findCells',
-    'findBestRow',
-    'addItem',
-    'clearEvents',
-    'renderEvents',
-    'onEventEnter',
-    'onEventLeave',
-    'onEventClick',
-    'onMonthChange',
-    'onLoad'
-
-    
-], function(p) {
-    Roo.log('add' + p);
-    Roo.CalendarPanel.prototype[p] = Roo.bootstrap.Calendar.prototype[p];
  
-});