fixed an issue with global timeout when using synchronous calls #16

michaelschwarz · May 10, 2023 · 77ccc8c · 77ccc8c
1 parent 69c83ad
commit 77ccc8c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/AjaxPro/Utilities/Constant.cs b/AjaxPro/Utilities/Constant.cs
@@ -26,6 +26,7 @@
 /*
  * MS	06-03-10	changed assembly version to correct version from assembly info
  * MS	06-04-04	fixed if external version is using different assembly name
+ * MS	23-05-10	fixed an issue with global timeout when using synchronous calls
  * 
  * 
  */
@@ -52,6 +53,6 @@ public sealed class Constant
         /// <summary>
 		/// The assembly version.
 		/// </summary>
-        public const string AssemblyVersion = "23.5.5.1";
+        public const string AssemblyVersion = "23.5.10.1";
 	}
 }
diff --git a/AjaxPro/core.js b/AjaxPro/core.js
@@ -299,7 +299,9 @@ AjaxPro.Request.prototype = {
 		}
 		if (this.isRunning) {
 			this.isRunning = false;
-			this.onLoading(false);
+			if (this.onLoading !== null) {
+				this.onLoading(false);
+			}
 		}
 	},
 	dispose: function () {
@@ -524,7 +526,7 @@ AjaxPro.RequestQueue.prototype = {
 	}
 };
 
-AjaxPro.queue = new AjaxPro.RequestQueue(2);	// 2 http connections
+AjaxPro.queue = new AjaxPro.RequestQueue(2);	// max 2 http connections
 
 AjaxPro.AjaxClass = function (url) {
 	this.url = url;
@@ -542,7 +544,10 @@ AjaxPro.AjaxClass.prototype = {
 			}
 		}
 		var r = new AjaxPro.Request();
+		// r.onLoading = AjaxPro.onLoading;
 		r.url = this.url;
-		return r.invoke(method, args);
+		var res = r.invoke(method, args);
+		r.abort();
+		return res;
 	}
 };