Author: pyaschenko Date: 2007-09-03 10:12:29 -0400 (Mon, 03 Sep 2007) New Revision: 2714 Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx Log: RF-796 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 2007-09-03 14:06:59 UTC (rev 2713) +++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-09-03 14:12:29 UTC (rev 2714) @@ -586,21 +586,25 @@ this.setPopupEvents(base);*/ //rect calculation - var offsetBase1 = Position.cumulativeOffset(baseInput); - var offsetBase2 = Position.cumulativeOffset(baseButton); - var els = element.style; - var offsetBase = [offsetBase1[0]<offsetBase2[0] ? offsetBase1[0] : offsetBase2[0], - offsetBase1[1]<offsetBase2[1] ? offsetBase1[1] : offsetBase2[1]]; + var offsetBase = Position.cumulativeOffset(baseButton); + if (this.params.showInput) + { + var offsetBase1 = Position.cumulativeOffset(baseInput); + + offsetBase = [offsetBase[0]<offsetBase1[0] ? offsetBase[0] : offsetBase1[0], + offsetBase[1]<offsetBase1[1] ? offsetBase[1] : offsetBase1[1]]; + var offsetDimInput = Richfaces.Calendar.getOffsetDimensions(baseInput); + } + var offsetDimBase = Richfaces.Calendar.getOffsetDimensions(base); var offsetDimButton = Richfaces.Calendar.getOffsetDimensions(baseButton); - var offsetDimInput = Richfaces.Calendar.getOffsetDimensions(baseInput); var o = {left: offsetBase[0], top: offsetBase[1], width: offsetDimBase.width, - height: (offsetDimButton.height>offsetDimInput.height ? offsetDimButton.height : offsetDimInput.height)}; - + height: (offsetDimInput && offsetDimInput.height>offsetDimButton.height ? offsetDimInput.height : offsetDimButton.height)}; + Richfaces.Calendar.setElementPosition(element, o, this.params.jointPoint, this.params.direction); if (Richfaces.browser.isIE6) @@ -626,7 +630,7 @@ }, eventOnCollapse: function (e) { - if (Event.element(e).id == this.POPUP_BUTTON_ID) return true; + if (Event.element(e).id == this.POPUP_BUTTON_ID || (!this.params.enableManualInput && Event.element(e).id == this.INPUT_DATE_ID) ) return true; Position.prepare(); if (Position.withinIncludingScrolloffsets($(this.id), Event.pointerX(e), Event.pointerY(e))) return true; Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx =================================================================== --- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-09-03 14:06:59 UTC (rev 2713) +++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-09-03 14:12:29 UTC (rev 2714) @@ -34,6 +34,8 @@ toolTipMode:'#{component.toolTipMode}', boundaryDatesMode:'#{component.boundaryDatesMode}', popup: #{component.popup}, + enableManualInput: #{component.attributes['enableManualInput']}, + showInput: #{component.attributes['showInput']}, disabled: #{component.disabled}, <f:call name="writeSymbols" />, firstWeekDay: #{this:getFirstWeekDay(context, component)}, @@ -104,20 +106,20 @@ boolean showInput = getUtils().isBooleanAttribute(component, "showInput"); boolean manualInput = getUtils().isBooleanAttribute(component, "enableManualInput"); - String onclick =null; + String onfieldclick =null; String type="text"; if(manualInput){ variables.setVariable("manualInput",new Boolean(!manualInput)); } else{ variables.setVariable("manualInput",new Boolean(!manualInput)); - onclick = "$('"+clientId+"').component.doExpand();"; + onfieldclick = "$('"+clientId+"').component.doSwitch();"; } if (!showInput){ type="hidden"; } - variables.setVariable("onclick",onclick); + variables.setVariable("onfieldclick",onfieldclick); variables.setVariable("type",type); ]]> @@ -136,7 +138,7 @@ onselect="#{component.attributes['oninputselect']}" onfocus="#{component.attributes['oninputfocus']}" onblur="#{component.attributes['oninputblur']}" - onclick="#{component.attributes['oninputclick']}" + onclick="#{onfieldclick} #{component.attributes['oninputclick']}" onkeypress="#{component.attributes['oninputkeypress']}" onkeydown="#{component.attributes['oninputkeydown']}" onkeyup="#{component.attributes['oninputkeyup']}"