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/05/19 11:52:15 UTC

svn commit: r1744555 - in /myfaces/tobago/trunk/tobago-core/src/main: faces-config/faces-config.xml java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.java

Author: lofwyr
Date: Thu May 19 11:52:15 2016
New Revision: 1744555

URL: http://svn.apache.org/viewvc?rev=1744555&view=rev
Log:
TOBAGO-1524: Use standard AJAX mechanism
* cleanup: remove the old AJAX stuff from Tobago.

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/faces-config/faces-config.xml
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.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=1744555&r1=1744554&r2=1744555&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 Thu May 19 11:52:15 2016
@@ -30,7 +30,7 @@
   </application>
 
   <lifecycle>
-    <phase-listener>org.apache.myfaces.tobago.internal.ajax.AjaxNavigationListener</phase-listener>
+    <!--<phase-listener>org.apache.myfaces.tobago.internal.ajax.AjaxNavigationListener</phase-listener>-->
     <phase-listener>org.apache.myfaces.tobago.lifecycle.SecretPhaseListener</phase-listener>
   </lifecycle>
 

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=1744555&r1=1744554&r2=1744555&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 Thu May 19 11:52:15 2016
@@ -193,7 +193,7 @@ public final class AjaxNavigationState {
   }
 
   public static void afterInvokeApplication(FacesContext facesContext) {
-    if (/*AjaxUtils.isAjaxRequest(facesContext) &&*/ isNavigation(facesContext)) {
+    if (/*AjaxUtils.isAjaxRequest(facesContext) */ false && isNavigation(facesContext)) {
       try {
         facesContext.getExternalContext().getSessionMap().put(SESSION_KEY, new AjaxNavigationState(facesContext));
         AjaxInternalUtils.requestNavigationReload(facesContext);