Author: konstantin.mishin Date: 2010-04-30 13:34:27 -0400 (Fri, 30 Apr 2010) New Revision: 16858 Modified: branches/enterprise/3.3.X/ui/calendar/src/main/config/component/calendar.xml branches/enterprise/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js branches/enterprise/3.3.X/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx Log: RFPL-542 Modified: branches/enterprise/3.3.X/ui/calendar/src/main/config/component/calendar.xml =================================================================== --- branches/enterprise/3.3.X/ui/calendar/src/main/config/component/calendar.xml 2010-04-30 17:26:17 UTC (rev 16857) +++ branches/enterprise/3.3.X/ui/calendar/src/main/config/component/calendar.xml 2010-04-30 17:34:27 UTC (rev 16858) @@ -183,6 +183,14 @@ <defaultvalue>false</defaultvalue> </property> <property> + <name>hidePopupOnScroll</name> + <classname>boolean</classname> + <description> + Hide popup when user scrolls content. If false opened popup wouldn't be closed on scroll but component should be placed into a relative container, otherwise popup wouldn't be scrolled. Does not affect on document body scroll. Default value is &quot;true&quot;. + </description> + <defaultvalue>true</defaultvalue> + </property> + <property> <name>jointPoint</name> <classname>java.lang.String</classname> <description> Modified: branches/enterprise/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js =================================================================== --- branches/enterprise/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2010-04-30 17:26:17 UTC (rev 16857) +++ branches/enterprise/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2010-04-30 17:34:27 UTC (rev 16858) @@ -1216,7 +1216,9 @@ Event.observe(window.document, "click", this.eventOnCollapse, false); Richfaces.removeScrollEventHandlers(this.scrollElements, this.eventOnScroll); - this.scrollElements = Richfaces.setupScrollEventHandlers(element, this.eventOnScroll); + if (this.params.hidePopupOnScroll) { + this.scrollElements = Richfaces.setupScrollEventHandlers(element, this.eventOnScroll); + } } }, Modified: branches/enterprise/3.3.X/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx =================================================================== --- branches/enterprise/3.3.X/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2010-04-30 17:26:17 UTC (rev 16857) +++ branches/enterprise/3.3.X/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2010-04-30 17:34:27 UTC (rev 16858) @@ -195,8 +195,8 @@ showWeekDaysBar:#{component.attributes['showWeekDaysBar']}, showApplyButton:#{component.attributes['showApplyButton']}, resetTimeOnDateSelect:#{component.attributes['resetTimeOnDateSelect']}, - defaultTime:#{this:getPreparedDefaultTime(component)} - + defaultTime:#{this:getPreparedDefaultTime(component)}, + hidePopupOnScroll:#{component.attributes['hidePopupOnScroll']} <f:call name="writeLabels" /> <f:call name="writeClass"/>