--- googlecode.com/svn/trunk/public_html/meteor.js	2007/05/14 15:32:03	22
+++ googlecode.com/svn/trunk/public_html/meteor.js	2007/10/10 22:24:32	30
@@ -30,7 +30,7 @@
 	this.callback_eof = function() {};
 	this.callback_changemode = function() {};
 	this.callback_statuschanged = function() {};
-	this.persist = true;
+	this.persist = 1;
 	this.frameloadtimer = false;
 	this.debugmode = false;
 	this.subsurl = false;
@@ -42,11 +42,11 @@
 	// Documented public properties
 	this.subdomain = "data";
 	this.dynamicpageaddress = "push";
-	this.smartpoll = true;
+	this.smartpoll = 1;
 	this.pollfreq = 2000;
 	this.minpollfreq = 2000;
-	this.mode = "poll";
-	this.polltimeout=30000;
+	this.mode = "stream";
+	this.polltimeout = 30000;
 	this.pingtimeout = 10000;
 	this.maxmessages = 0;
 	this.status = 0;
@@ -90,6 +90,13 @@
 	this.instances[instid].reset();
 }
 
+window.onunload = function() {
+	for (var i in Meteor.instances) {
+		if (Meteor.instances[i].transferDoc) delete Meteor.instances[i].transferDoc;
+	}
+}
+
+
 Meteor.prototype.joinChannel = function(channelname, backtrack) {
 	if (typeof(this.channels[channelname]) != "undefined") throw "Cannot join channel "+channelname+": already subscribed";
 	this.channels[channelname] = {backtrack:backtrack, lastmsgreceived:0};
@@ -107,7 +114,7 @@
 }
 
 Meteor.prototype.start = function() {
-	this.persist = (this.maxmessages)?1:0;
+	this.persist = (this.persist)?1:0;
 	this.smartpoll = (this.smartpoll)?1:0;
 	this.mode = (this.mode=="stream")?"stream":"poll";
 	if (!this.subdomain || !this.channelcount) throw "Channel or Meteor subdomain host not specified";
@@ -115,19 +122,7 @@
 	var now = new Date();
 	var t = now.getTime();
 	this.setstatus(1);
-	var surl = "http://" + this.subdomain + "." + location.hostname + "/" + this.dynamicpageaddress + "?id=" + this.MHostId;
-	if (this.maxmessages && !this.persist) surl += "&maxmessages=" + this.maxmessages;
-	for (var c in this.channels) {
-		surl += "&channel="+c;
-		if (this.channels[c].lastmsgreceived > 0) {
-			surl += "&restartfrom="+this.channels[c].lastmsgreceived;
-		} else if (this.channels[c].backtrack > 0) {
-			surl += "&backtrack="+this.channels[c].backtrack;
-		} else if (this.channels[c].backtrack < 0 || isNaN(this.channels[c].backtrack)) {
-			surl += "&restartfrom=";
-		}
-	}
-	this.subsurl = surl;
+	this.updateSubsUrl();
 	if (this.mode=="stream") {
 		if (document.all) {
 			this.createIframe(this.subsurl);
@@ -139,7 +134,7 @@
 		this.pingtimer = setTimeout(f, this.pingtimeout);
 
 	} else {
-		this.createIframe("http://"+this.subdomain+"."+location.hostname+"/poll.html");
+		this.createIframe("http://"+this.subdomain+"."+location.hostname+"/poll.html?nc="+t);
 		this.recvtimes[0] = t;
 		if (this.updatepollfreqtimer) clearTimeout(this.updatepollfreqtimer);
 		this.updatepollfreqtimer = setInterval(this.updatepollfreq.bind(this), 2500);
@@ -147,9 +142,30 @@
 	this.lastrequest = t;
 }
 
+Meteor.prototype.updateSubsUrl = function() {
+
+	// If streaming or long polling, connection should persist
+	this.persist = (this.mode == "stream" || (this.mode=='poll' && this.maxmessages > 0)) ? 1 : 0;
+	var surl = "http://" + this.subdomain + "." + location.hostname + "/" + this.dynamicpageaddress + "?id=" + this.MHostId;
+	if (this.persist && this.mode != "stream") surl += "&maxmessages=" + this.maxmessages;
+	surl += "&persist="+this.persist;
+	for (var c in this.channels) {
+		surl += "&channel="+c;
+		if (this.channels[c].lastmsgreceived > 0) {
+			surl += "&restartfrom="+(this.channels[c].lastmsgreceived+1);
+		} else if (this.channels[c].backtrack > 0) {
+			surl += "&backtrack="+this.channels[c].backtrack;
+		} else if (this.channels[c].backtrack < 0 || isNaN(this.channels[c].backtrack)) {
+			surl += "&restartfrom=";
+		}
+	}
+	this.subsurl = surl;
+}
+
 Meteor.prototype.createIframe = function(url) {
-	if (document.all) {
-		this.transferDoc = new ActiveXObject("htmlfile");
+	delete this.transferDoc;
+	if (document.all) try { this.transferDoc = new ActiveXObject("htmlfile") } catch(ex) { this.transferDoc = null }
+	if (document.all && this.transferDoc) {
 		this.transferDoc.open();
 		this.transferDoc.write("<html>");
 		this.transferDoc.write("<script>document.domain=\""+(document.domain)+"\";</"+"script>");
@@ -223,6 +239,7 @@
 			while (this.recvtimes.length > 5) this.recvtimes.shift();
 		}
 	}
+	this.updateSubsUrl();
 	this.setstatus(5);
 }