X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2FDatePicker.js;h=001c63bbb6d03cf5ceedfa9be7795132e013e75b;hb=0b69a11b1055a6d3a3fd0719bdd58b5a235de0e4;hp=aa6b19a1f531fa64d3cacb72364cda59ac3762c2;hpb=112bc16461da3d7938faaad1157550e13313f258;p=roojs1 diff --git a/Roo/DatePicker.js b/Roo/DatePicker.js index aa6b19a1f5..001c63bbb6 100644 --- a/Roo/DatePicker.js +++ b/Roo/DatePicker.js @@ -19,7 +19,7 @@ */ Roo.DatePicker = function(config){ Roo.DatePicker.superclass.constructor.call(this, config); -Roo.log(config); + this.value = config && config.value ? config.value.clearTime() : new Date().clearTime(); @@ -49,7 +49,9 @@ Roo.log(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 = [ '', '', @@ -461,7 +473,6 @@ Roo.extend(Roo.DatePicker, Roo.Component, { }, hideMonthPicker : function(disableAnim){ - if(this.monthPicker){ if(disableAnim === true){ this.monthPicker.hide();