X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2FDatePicker.js;h=001c63bbb6d03cf5ceedfa9be7795132e013e75b;hb=61bc45258e16a779856dd2ad0862630b489e4583;hp=76032518d725ad9e102cf078a235892e52a8afe2;hpb=92b9f8bccb4f541f318065b77c4be9a901124dd5;p=roojs1 diff --git a/Roo/DatePicker.js b/Roo/DatePicker.js index 76032518d7..001c63bbb6 100644 --- a/Roo/DatePicker.js +++ b/Roo/DatePicker.js @@ -30,7 +30,7 @@ Roo.DatePicker = function(config){ * @param {DatePicker} this * @param {Date} date The selected date */ - 'select': true + 'select': true, /** * @event monthchange * Fires when the displayed month changes @@ -49,7 +49,9 @@ Roo.DatePicker = function(config){ var re = "(?:"; for(var i = 0; i < dd.length; i++){ re += dd[i]; - if(i != dd.length-1) re += "|"; + if(i != dd.length-1) { + re += "|"; + } } this.disabledDatesRE = new RegExp(re + ")"); } @@ -170,6 +172,15 @@ Roo.extend(Roo.DatePicker, Roo.Component, { */ setValue : function(value){ var old = this.value; + + if (typeof(value) == 'string') { + + value = Date.parseDate(value, this.format); + } + if (!value) { + value = new Date(); + } + this.value = value.clearTime(true); if(this.el){ this.update(this.value); @@ -191,8 +202,9 @@ Roo.extend(Roo.DatePicker, Roo.Component, { } }, - // private + // privateval onRender : function(container, position){ + var m = [ '', '', @@ -518,7 +530,8 @@ Roo.extend(Roo.DatePicker, Roo.Component, { }, // private - update : function(date){ + update : function(date) + { var vd = this.activeDate; this.activeDate = date; if(vd && this.el){ @@ -537,6 +550,7 @@ Roo.extend(Roo.DatePicker, Roo.Component, { return; } } + var days = date.getDaysInMonth(); var firstOfMonth = date.getFirstDateOfMonth(); var startingPos = firstOfMonth.getDay()-this.startDay; @@ -628,7 +642,8 @@ Roo.extend(Roo.DatePicker, Roo.Component, { } this.mbtn.setText(this.monthNames[date.getMonth()] + " " + date.getFullYear()); - + this.fireEvent('monthchange', this, date); + if(!this.internalRender){ var main = this.el.dom.firstChild; var w = main.offsetWidth; @@ -644,5 +659,7 @@ Roo.extend(Roo.DatePicker, Roo.Component, { this.update.defer(10, this, [date]); } } + + } }); \ No newline at end of file