myfaces-commits mailing list archives

Author: weber
Date: Mon Jul 11 09:38:05 2016
New Revision: 1752136

URL: http://svn.apache.org/viewvc?rev=1752136&view=rev
Log:
TOBAGO-1573 - Ajax: auto reload breaks navigation response

Modified:
    myfaces/tobago/branches/tobago-2.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js

Modified: myfaces/tobago/branches/tobago-2.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-2.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js?rev=1752136&r1=1752135&r2=1752136&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-2.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
(original)
+++ myfaces/tobago/branches/tobago-2.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
Mon Jul 11 09:38:05 2016
@@ -1879,7 +1879,7 @@ Tobago.Transport = {
     this.requests.shift();
     this.currentActionId = null;
     console.debug('Request complete! Duration: ' + (new Date().getTime() - this.startTime)
+ 'ms; Queue size : ' + this.requests.length); // @DEV_ONLY
-    if (this.requests.length > 0) {
+    if (!this.pageSubmitted && this.requests.length > 0) {
       console.debug('Execute request!'); // @DEV_ONLY
       this.startTime = new Date().getTime();
       this.requests[0]();
@@ -2125,9 +2125,11 @@ Tobago.Updater = {
       if (Tobago.Updater.WAIT_ON_RELOAD) {
         alert('wait: full reload requeste: responseCode = ' + requestOptions.resultData.responseCode);
       }
+      Tobago.Transport.pageSubmitted = true;
       Tobago.navigateToUrl(requestOptions.resultData.location);
       return;
     } else if (requestOptions.resultData.responseCode == Tobago.Updater.CODE_REDIRECT) {
+      Tobago.Transport.pageSubmitted = true;
       window.location = requestOptions.resultData.location;
       return;
     }