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 2016/10/07 10:23:18 UTC

svn commit: r1763730 - in /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago: ajax/AjaxUtils.java internal/ajax/AjaxInternalUtils.java internal/ajax/AjaxNavigationState.java

Author: lofwyr
Date: Fri Oct  7 10:23:18 2016
New Revision: 1763730

URL: http://svn.apache.org/viewvc?rev=1763730&view=rev
Log:
TOBAGO-1524: Use standard AJAX mechanism
* cleanup

Removed:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java
Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxInternalUtils.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.java

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=1763730&r1=1763729&r2=1763730&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 Oct  7 10:23:18 2016
@@ -39,9 +39,6 @@ public final class AjaxInternalUtils {
   }
 
   public static boolean redirect(final FacesContext facesContext, final String url) throws IOException {
-//    if (!AjaxUtils.isAjaxRequest(facesContext)) {
-//      return false;
-//    }
     redirect((HttpServletResponse) facesContext.getExternalContext().getResponse(), url);
     facesContext.responseComplete();
     return true;

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.java?rev=1763730&r1=1763729&r2=1763730&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.java Fri Oct  7 10:23:18 2016
@@ -19,6 +19,7 @@
 
 package org.apache.myfaces.tobago.internal.ajax;
 
+import org.apache.myfaces.tobago.util.AjaxUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -193,8 +194,7 @@ public final class AjaxNavigationState {
   }
 
   public static void afterInvokeApplication(FacesContext facesContext) {
-//    if (AjaxUtils.isAjaxRequest(facesContext) && isNavigation(facesContext)) {
-    if (false) {
+    if (AjaxUtils.isAjaxRequest(facesContext) && isNavigation(facesContext)) {
       try {
         facesContext.getExternalContext().getSessionMap().put(SESSION_KEY, new AjaxNavigationState(facesContext));
         AjaxInternalUtils.requestNavigationReload(facesContext);