You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2012/04/24 14:54:41 UTC
svn commit: r1329688 - in /myfaces/tobago/trunk:
tobago-core/src/main/faces-config/
tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/
tobago-example/tobago-example-demo/src/main/webapp/content/20-popup/
tobago-theme/tobago-theme-scarborough/s...
Author: lofwyr
Date: Tue Apr 24 12:54:41 2012
New Revision: 1329688
URL: http://svn.apache.org/viewvc?rev=1329688&view=rev
Log:
TOBAGO-1109: An instance of TobagoContext with scope none should be available as managed bean
TOBAGO-1110: Date picker popup should be opened side by side to the picker button
Modified:
myfaces/tobago/trunk/tobago-core/src/main/faces-config/faces-config.xml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-popup/popup.xhtml
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/faces-config/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/faces-config/faces-config.xml?rev=1329688&r1=1329687&r2=1329688&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/faces-config/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/faces-config/faces-config.xml Tue Apr 24 12:54:41 2012
@@ -31,7 +31,7 @@
<component-class>org.apache.myfaces.tobago.component.UIMenuSelectOne</component-class>
</component>
- <!-- use tobagos UIViewRoot -->
+ <!-- use Tobagos UIViewRoot -->
<component>
<component-type>javax.faces.ViewRoot</component-type>
<component-class>org.apache.myfaces.tobago.component.UIViewRoot</component-class>
@@ -42,4 +42,11 @@
<managed-bean-class>org.apache.myfaces.tobago.context.ClientProperties</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+
+ <managed-bean>
+ <managed-bean-name>tobagoContext</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.tobago.context.TobagoContext</managed-bean-class>
+ <managed-bean-scope>none</managed-bean-scope>
+ </managed-bean>
+
</faces-config>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml?rev=1329688&r1=1329687&r2=1329688&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml Tue Apr 24 12:54:41 2012
@@ -55,12 +55,6 @@
</converter>
<managed-bean>
- <managed-bean-name>tobago</managed-bean-name>
- <managed-bean-class>org.apache.myfaces.tobago.context.TobagoContext</managed-bean-class>
- <managed-bean-scope>none</managed-bean-scope>
- </managed-bean>
-
- <managed-bean>
<managed-bean-name>demo</managed-bean-name>
<managed-bean-class>org.apache.myfaces.tobago.example.demo.TobagoDemoController</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-popup/popup.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-popup/popup.xhtml?rev=1329688&r1=1329687&r2=1329688&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-popup/popup.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-popup/popup.xhtml Tue Apr 24 12:54:41 2012
@@ -128,7 +128,7 @@
<tc:button label="Open here">
<f:facet name="popup">
<tc:popup width="180" height="110" id="positioned_popup"
- left="#{tobago.actionPosition.right.pixel + 5}" top="#{tobago.actionPosition.top.pixel}">
+ left="#{tobagoContext.actionPosition.right.pixel + 5}" top="#{tobagoContext.actionPosition.top.pixel}">
<f:facet name="layout">
<tc:gridLayout columns="*" rows="*"/>
</f:facet>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java?rev=1329688&r1=1329687&r2=1329688&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java Tue Apr 24 12:54:41 2012
@@ -78,9 +78,9 @@ public class DatePickerRenderer extends
popup.onComponentPopulated(facesContext, parent);
FacesUtils.setBindingOrExpression(
- popup, Attributes.LEFT, FacesUtils.createExpressionOrBinding("#{tobago.actionPosition.right.pixel + 5}"));
+ popup, Attributes.LEFT, FacesUtils.createExpressionOrBinding("#{tobagoContext.actionPosition.right.pixel + 5}"));
FacesUtils.setBindingOrExpression(
- popup, Attributes.TOP, FacesUtils.createExpressionOrBinding("#{tobago.actionPosition.top.pixel}"));
+ popup, Attributes.TOP, FacesUtils.createExpressionOrBinding("#{tobagoContext.actionPosition.top.pixel}"));
final UIBox box = (UIBox) CreateComponentUtils.createComponent(
facesContext, UIBox.COMPONENT_TYPE, RendererTypes.BOX, "box");