X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2FDatePicker.js;h=001c63bbb6d03cf5ceedfa9be7795132e013e75b;hb=0b69a11b1055a6d3a3fd0719bdd58b5a235de0e4;hp=95e764b3a9c4e04b4c3d5c8ebaf31fa5767a22c5;hpb=6ecd87f2c354fa5e2f02a344ecfe3ecf5564ebb3;p=roojs1 diff --git a/Roo/DatePicker.js b/Roo/DatePicker.js index 95e764b3a9..001c63bbb6 100644 --- a/Roo/DatePicker.js +++ b/Roo/DatePicker.js @@ -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,8 +172,13 @@ Roo.extend(Roo.DatePicker, Roo.Component, { */ setValue : function(value){ var old = this.value; + if (typeof(value) == 'string') { - value = Date.parseDate(value, 'Y-m-d'); + + value = Date.parseDate(value, this.format); + } + if (!value) { + value = new Date(); } this.value = value.clearTime(true); @@ -195,7 +202,7 @@ Roo.extend(Roo.DatePicker, Roo.Component, { } }, - // private + // privateval onRender : function(container, position){ var m = [