Skip to content
Browse files

Merge pull request #1327 from lift/asc_issue_1327

lift_uriSuffix can get lost during long-running AJAX requests
  • Loading branch information...
2 parents 83fc031 + c9279a4 commit 932d06bb56db9b4f33509d64b7517028264c083f @dpp dpp committed
Showing with 6 additions and 5 deletions.
  1. +6 −5 web/webkit/src/main/scala/net/liftweb/http/js/ScriptRenderer.scala
View
11 web/webkit/src/main/scala/net/liftweb/http/js/ScriptRenderer.scala
@@ -47,6 +47,12 @@ object ScriptRenderer {
toSend.onFailure = theFailure;
toSend.responseType = responseType;
+ if (liftAjax.lift_uriSuffix) {
+ theData += '&' + liftAjax.lift_uriSuffix;
+ toSend.theData = theData;
+ liftAjax.lift_uriSuffix = undefined;
+ }
+
liftAjax.lift_ajaxQueue.push(toSend);
liftAjax.lift_ajaxQueueSort();
liftAjax.lift_doCycleQueueCnt++;
@@ -161,11 +167,6 @@ object ScriptRenderer {
liftAjax.lift_actualJSONCall(aboutToSend.theData, successFunc, failureFunc);
} else {
var theData = aboutToSend.theData;
- if (liftAjax.lift_uriSuffix) {
- theData += '&' + liftAjax.lift_uriSuffix;
- aboutToSend.theData = theData;
- liftAjax.lift_uriSuffix = undefined;
- }
liftAjax.lift_actualAjaxCall(theData, successFunc, failureFunc);
}
}

0 comments on commit 932d06b

Please sign in to comment.
Something went wrong with that request. Please try again.