Author: abelevich Date: 2011-01-20 05:12:40 -0500 (Thu, 20 Jan 2011) New Revision: 21107 Modified: trunk/ui/output/ui/src/main/templates/dropdownmenu.template.xml trunk/ui/output/ui/src/main/templates/popupPanel.template.xml Log: REVERT changes from RF-10097 "Inline default values: output components I" due to failed tests Modified: trunk/ui/output/ui/src/main/templates/dropdownmenu.template.xml =================================================================== --- trunk/ui/output/ui/src/main/templates/dropdownmenu.template.xml 2011-01-20 09:41:18 UTC (rev 21106) +++ trunk/ui/output/ui/src/main/templates/dropdownmenu.template.xml 2011-01-20 10:12:40 UTC (rev 21107) @@ -50,10 +50,10 @@ <script type="text/javascript"> <cdk:scriptObject name="options"> - <cdk:scriptOption name="direction" value="#{getDirection(component).getValue()}" defaultValue="AA"/> - <cdk:scriptOption name="jointPoint" value="#{getJointPoint(component).getValue()}" defaultValue="AA"/> - <cdk:scriptOption name="showEvent" value="#{getShowEvent(component)}" defaultValue="click"/> - <cdk:scriptOption name="mode" value="#{getMode(component)}" defaultValue="server"/> + <cdk:scriptOption name="direction" value="#{getDirection(component).getValue()}"/> + <cdk:scriptOption name="jointPoint" value="#{getJointPoint(component).getValue()}"/> + <cdk:scriptOption name="showEvent" value="#{getShowEvent(component)}"/> + <cdk:scriptOption name="mode" value="#{getMode(component)}"/> <cdk:scriptOption attributes="hideDelay showEvent showDelay horizontalOffset verticalOffset" /> <cdk:scriptOption attributes="onshow onhide ongroupshow ongrouphide onitemclick" wrapper="eventHandler"/> </cdk:scriptObject> Modified: trunk/ui/output/ui/src/main/templates/popupPanel.template.xml =================================================================== --- trunk/ui/output/ui/src/main/templates/popupPanel.template.xml 2011-01-20 09:41:18 UTC (rev 21106) +++ trunk/ui/output/ui/src/main/templates/popupPanel.template.xml 2011-01-20 10:12:40 UTC (rev 21107) @@ -73,11 +73,11 @@ </div> <cdk:scriptObject name="options"> - <cdk:scriptOption name="left" value="#{getLeftOrDefault(component)}" defaultValue="auto"/> - <cdk:scriptOption name="top" value="#{getTopOrDefault(component)}" defaultValue="auto"/> - <cdk:scriptOption attributes="minHeight minWidth maxHeight maxWidth width height moveable followByScroll zindex shadowDepth shadowOpacity domElementAttachment show keepVisualState autosized resizeable modal overlapEmbedObjects visualOptions " /> - <cdk:scriptOption attributes="onshow onhide onresize onmove onbeforeshow onbeforehide" wrapper="eventHandler"/> - </cdk:scriptObject> + <cdk:scriptOption name="left" value="#{getLeftOrDefault(component)}" /> + <cdk:scriptOption name="top" value="#{getTopOrDefault(component)}" /> + <cdk:scriptOption attributes="width height minWidth minHeight maxWidth maxHeight moveable followByScroll left top zindex shadowDepth shadowOpacity domElementAttachment show keepVisualState autosized resizeable modal overlapEmbedObjects visualOptions " /> + <cdk:scriptOption attributes="onshow onhide onresize onmove onbeforeshow onbeforehide" wrapper="eventHandler"/> + </cdk:scriptObject> <script type="text/javascript"> new RichFaces.ui.PopupPanel(#{toScriptArgs(clientId, options)}); @@ -87,5 +87,7 @@ </script> </div> + + </cc:implementation> </cdk:root> \ No newline at end of file