From da11d93152ef0d6e562856029cb11b12f8b8b7d6 Mon Sep 17 00:00:00 2001
From: Thomas Brüderli
Date: Wed, 5 Sep 2007 16:00:35 +0000
Subject: Check for callback function first. Same effect as
 XMLHTTPRequest.abort()

---
 itjs.class     | 2 +-
 itjs/loader.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/itjs.class b/itjs.class
index f6da4cb..3e45973 100644
--- a/itjs.class
+++ b/itjs.class
@@ -38,7 +38,7 @@ function serialize($values, $envelope = false)
 	if (($envelope || isset($values['eof'])) && ($callback = it::replace(array('[^\w.]' => ""), $_REQUEST['itjs_call'])))
 	{
 		$target = $_REQUEST['itjs_iframe'] ? "parent" : "window";
-		$header = "$target.it_loader && $target.$callback(";
+		$header = "$target.it_loader && $target.$callback && $target.$callback.dataReady(";
 		$footer = "," . intval($_REQUEST['itjs_callid']) . ");";
 
 		if ($_REQUEST['itjs_iframe'])	# iframe-based loading required by Opera 7
diff --git a/itjs/loader.js b/itjs/loader.js
index 91f280d..6efdbee 100644
--- a/itjs/loader.js
+++ b/itjs/loader.js
@@ -116,7 +116,7 @@ load: function(baseurl, pos, num, query_volatile, retry)
 		}
 		else
 		{
-			var req_url = baseurl + "&pos=" + pos + "&num=" + num + (query_volatile ? query_volatile : "") + (this.post_data ? '&' + this.post_data : "") + "&itjs_call=it_loader.__inst" + this.instance + ".dataReady&itjs_callid=" + ++this.callid;
+			var req_url = baseurl + "&pos=" + pos + "&num=" + num + (query_volatile ? query_volatile : "") + (this.post_data ? '&' + this.post_data : "") + "&itjs_call=it_loader.__inst" + this.instance + "&itjs_callid=" + ++this.callid;
 
 			if (window.opera && !window.XMLHttpRequest)  // Opera 7 only works with iframes
 			{
-- 
cgit v1.2.3