Author: pyaschenko Date: 2008-12-16 07:41:52 -0500 (Tue, 16 Dec 2008) New Revision: 11804 Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js Log: https://jira.jboss.org/jira/browse/RF-2835 Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js =================================================================== --- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2008-12-16 12:30:50 UTC (rev 11803) +++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2008-12-16 12:41:52 UTC (rev 11804) @@ -2096,11 +2096,11 @@ { this.selectedDate = date; this.renderHF(); - if (!this.params.popup) this.setInputField(this.getSelectedDateString(this.params.datePattern), null); + if (!this.params.popup || !this.showApplyButton) this.setInputField(this.getSelectedDateString(this.params.datePattern), null); this.invokeEvent("timeselected",null, null, this.selectedDate); } } - if (this.params.popup && !this.showApplyButton && updateTime) this.close(true); + if (this.params.popup && !this.showApplyButton) this.close(false); }, showDateEditor: function()