From 02f6299ec3ce723f2cb15ce3b62ee578ded5a7d1 Mon Sep 17 00:00:00 2001
From: Thomas Brüderli
Date: Wed, 30 Jan 2008 14:24:43 +0000
Subject: Fix fallback to <script> tags

---
 itjs/loader.js | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'itjs/loader.js')

diff --git a/itjs/loader.js b/itjs/loader.js
index b5e0a44..0fa7c4e 100644
--- a/itjs/loader.js
+++ b/itjs/loader.js
@@ -10,6 +10,7 @@ function it_loader(handler)
 	this.handler = handler;
 	this.instance = it_loader.instances++;
 	this.callid = 0;
+	this.scrpt = [];
 	this.clear();
 }
 
@@ -121,20 +122,21 @@ load: function(baseurl, pos, num, query_volatile, retry)
 
 			if (!use_script || (window.opera && !window.XMLHttpRequest))  // Opera 7 only works with iframes
 			{
-				this.scrpt = document.createElement("iframe");
-				this.scrpt.style.width = this.scrpt.style.height = 1;
+				var scrpt = document.createElement("iframe");
+				scrpt.style.width = scrpt.style.height = 1;
 				req_url += "&itjs_iframe=1";
 			}
 			else
-				this.scrpt = document.createElement("script");
+				var scrpt = document.createElement("script");
 
 			it_loader['__inst' + this.instance] = this;
 			this.req = { starttime: this.starttime, retry: retry };
 			try
 			{
-				if (!document.all) this.scrpt.src = req_url;
-				document.body.appendChild(this.scrpt);
-				if (document.all) this.scrpt.src = req_url;
+				this.scrpt[this.callid] = scrpt;
+				if (!document.all) scrpt.src = req_url;
+				document.body.appendChild(scrpt);
+				if (document.all) scrpt.src = req_url;
 			}
 			catch (e) { return false; }
 		}
@@ -236,7 +238,7 @@ dataReady: function(data, callid)
 		it_loader.sequence += "h";
 	}
 
-	this.unlink();
+	this.unlink(callid);
 },
 
 stop: function()
@@ -247,21 +249,21 @@ stop: function()
 	}
 	catch (e) { }
 
-	this.unlink();
+	this.unlink(this.callid);
 },
 
-unlink: function()
+unlink: function(callid)
 {
-	if (it_loader['__inst' + this.instance])
+	if (it_loader['__inst' + this.instance] && callid == this.callid)
 		it_loader['__inst' + this.instance] = null;
 
 	if (this.req)
 		this.req = null;
 
-	if (this.scrpt)
+	if (this.scrpt[callid])
 	{
-		document.body.removeChild(this.scrpt);
-		this.scrpt = null;
+		document.body.removeChild(this.scrpt[callid]);
+		this.scrpt[callid] = null;
 	}
 
 	it_loader.sequence = "";
-- 
cgit v1.2.3