X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=roojs-calendar-debug.js;fp=roojs-calendar-debug.js;h=93cb1c4f27bc784c975ba288106a3e880a5adfd3;hb=10693a871ee6374b8e9f19c344ceb447ed0531d2;hp=2854206bacd5a1b8d8370706093a94acd3d55cd5;hpb=7dfd0d3cd68424e103991ef6946d2368cbe08a81;p=roojs1 diff --git a/roojs-calendar-debug.js b/roojs-calendar-debug.js index 2854206bac..93cb1c4f27 100644 --- a/roojs-calendar-debug.js +++ b/roojs-calendar-debug.js @@ -360,7 +360,7 @@ Roo.extend(Roo.bootstrap.Component, Roo.BoxComponent, { 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]))); } } @@ -1357,7 +1357,7 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component, { * @param {Object} config The config object */ -Roo.CalendarPanel = function(config){ +Roo.panel.Calendar = function(config){ Roo.log("cal panel ctr"); @@ -1366,7 +1366,7 @@ Roo.CalendarPanel = function(config){ //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); @@ -1449,7 +1449,7 @@ Roo.CalendarPanel = function(config){ }; -Roo.extend(Roo.CalendarPanel, Roo.ContentPanel, { +Roo.extend(Roo.panel.Calendar, Roo.panel.Content, { render : function()