--- googlecode.com/svn/trunk/public_html/meteor.js 2007/05/20 14:19:00 24
+++ googlecode.com/svn/trunk/public_html/meteor.js 2007/10/10 22:18:30 29
@@ -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,10 +42,10 @@
// 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.mode = "stream";
this.polltimeout = 30000;
this.pingtimeout = 10000;
this.maxmessages = 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";
@@ -136,9 +143,11 @@
}
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.maxmessages && this.persist && this.mode != "stream") surl += "&maxmessages=" + this.maxmessages;
- if (this.mode == "poll" && this.maxmessages == 0 && this.persist==1) this.persist=0;
+ if (this.persist && this.mode != "stream") surl += "&maxmessages=" + this.maxmessages;
surl += "&persist="+this.persist;
for (var c in this.channels) {
surl += "&channel="+c;
@@ -154,7 +163,9 @@
}
Meteor.prototype.createIframe = function(url) {
- if (document.all) {
+ delete this.transferDoc;
+ if (document.all) try { this.transferDoc = new ActiveXObject("htmlfile") } catch(ex) { this.transferDoc = null }
+ if (document.all && this.transferDoc) {
this.transferDoc = new ActiveXObject("htmlfile");
this.transferDoc.open();
this.transferDoc.write("");