/**
* @class Roo.bootstrap.Component
* @extends Roo.Component
+ * @abstract
+ * @children Roo.bootstrap.Component
* Bootstrap Component base class
* @cfg {String} cls css class
* @cfg {String} style any extra css
}
if (this.cls) {
- cfg.cls = (typeof(cfg.cls) == 'undefined') ? this.cls : cfg.cls + ' ' + this.cls;
+ cfg.cls = (typeof(cfg.cls) == 'undefined' ? this.cls : cfg.cls) + ' ' + this.cls;
}
if (this.style) { // fixme needs to support more complex style data.
- cfg.style = this.style;
+ cfg.style = (typeof(cfg.style) == 'undefined' ? this.style : cfg.style) + '; ' + this.style;
}
if(this.name){
if (!skip_children) {
for(var i =0;i < items.length;i++) {
// Roo.log(['add child', items[i]]);
- nitems.push(cn.addxtype(Roo.apply({}, items[i])));
+ nitems.push(cn.addxtype(items[i].xns == false ? items[i] : Roo.apply({}, items[i])));
}
}
Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component, {
+ /**
+ * @cfg {Roo.data.Store} store
+ * The data source for the calendar
+ */
+ store : false,
/**
* @cfg {Number} startDay
* Day index at which the week should begin, 0-based (defaults to 0, which is Sunday)
* @param {Object} config The config object
*/
-Roo.CalendarPanel = function(config){
+Roo.panel.Calendar = function(config){
Roo.log("cal panel ctr");
//this.wrapper.dom.appendChild(grid.getGridEl().dom);
- Roo.CalendarPanel.superclass.constructor.call(this, this.wrapper, config);
+ Roo.panel.Calendar.superclass.constructor.call(this, this.wrapper, config);
Roo.log(this.el);
};
-Roo.extend(Roo.CalendarPanel, Roo.ContentPanel, {
+Roo.extend(Roo.panel.Calendar, Roo.panel.Content, {
render : function()