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 2014/08/01 16:36:07 UTC
svn commit: r1615121 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/
tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/
Author: lofwyr
Date: Fri Aug 1 14:36:07 2014
New Revision: 1615121
URL: http://svn.apache.org/r1615121
Log:
TOBAGO-1414: Utility method for AJAX Request detection in non-faces scenario
- cleanup
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java?rev=1615121&r1=1615120&r2=1615121&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java Fri Aug 1 14:36:07 2014
@@ -46,11 +46,13 @@ public final class AjaxUtils {
}
public static boolean isAjaxRequest(final FacesContext facesContext) {
- return AjaxInternalUtils.isAjaxRequest(facesContext);
+ return facesContext.getExternalContext().getRequestParameterMap().get(AjaxInternalUtils.TOBAGO_PARTIAL_IDS) != null;
}
public static boolean isAjaxRequest(final ServletRequest request) {
- return AjaxInternalUtils.isAjaxRequest((Map<String, String[]>) request.getParameterMap());
+ final String[] ajaxComponentIds
+ = ((Map<String, String[]>) request.getParameterMap()).get(AjaxInternalUtils.TOBAGO_PARTIAL_IDS);
+ return ajaxComponentIds != null && ajaxComponentIds.length > 0;
}
public static void removeAjaxComponent(final FacesContext facesContext, final String clientId) {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java?rev=1615121&r1=1615120&r2=1615121&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java Fri Aug 1 14:36:07 2014
@@ -221,17 +221,8 @@ public final class AjaxInternalUtils {
}
}
- public static boolean isAjaxRequest(final FacesContext facesContext) {
- return facesContext.getExternalContext().getRequestParameterMap().get(AjaxInternalUtils.TOBAGO_PARTIAL_IDS) != null;
- }
-
- public static boolean isAjaxRequest(final Map<String, String[]> parameterMap) {
- final String[] ajaxComponentIds = parameterMap.get(AjaxInternalUtils.TOBAGO_PARTIAL_IDS);
- return ajaxComponentIds != null && ajaxComponentIds.length > 0;
- }
-
public static boolean redirect(final FacesContext facesContext, final String url) throws IOException {
- if (!isAjaxRequest(facesContext)) {
+ if (!AjaxUtils.isAjaxRequest(facesContext)) {
return false;
}
redirect((HttpServletResponse) facesContext.getExternalContext().getResponse(), url);
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml?rev=1615121&r1=1615120&r2=1615121&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml Fri Aug 1 14:36:07 2014
@@ -59,7 +59,7 @@
</tx:date>
<tx:time label="#{overviewBundle.basic_timeLabel}" tabIndex="5"
value="#{overviewController.basicTime}">
- <f:convertDateTime type="time" timeStyle="medium"/>
+ <f:convertDateTime type="time" timeStyle="medium" timeZone="GMT+04:00"/>
</tx:time>
<tx:in value="#{overviewController.placeholder}" tabIndex="6"
label="Placeholder" placeholder="Search..."/>