myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From we...@apache.org
Subject svn commit: r1752412 - /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
Date Wed, 13 Jul 2016 12:34:06 GMT
Author: weber
Date: Wed Jul 13 12:34:06 2016
New Revision: 1752412

URL: http://svn.apache.org/viewvc?rev=1752412&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=1752412&r1=1752411&r2=1752412&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
Wed Jul 13 12:34:06 2016
@@ -1817,6 +1817,7 @@ Tobago.Transport = {
   requests: [],
   currentActionId: null,
   pageSubmitted: false,
+  pageAborted: false,
   ajaxTransport: undefined,
 
   initTransport: function() {
@@ -1879,7 +1880,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.pageSubmitted && this.requests.length > 0) {
+    if (!this.pageAborted && this.requests.length > 0) {
       console.debug('Execute request!'); // @DEV_ONLY
       this.startTime = new Date().getTime();
       this.requests[0]();
@@ -2125,11 +2126,11 @@ Tobago.Updater = {
       if (Tobago.Updater.WAIT_ON_RELOAD) {
         alert('wait: full reload requeste: responseCode = ' + requestOptions.resultData.responseCode);
       }
-      Tobago.Transport.pageSubmitted = true;
+      Tobago.Transport.pageAborted = true;
       Tobago.navigateToUrl(requestOptions.resultData.location);
       return;
     } else if (requestOptions.resultData.responseCode == Tobago.Updater.CODE_REDIRECT) {
-      Tobago.Transport.pageSubmitted = true;
+      Tobago.Transport.pageAborted = true;
       window.location = requestOptions.resultData.location;
       return;
     }



Mime
View raw message