Skip to content

Commit

Permalink
Merge pull request #217 from fat/rebuild
Browse files Browse the repository at this point in the history
rebuild dist files!
  • Loading branch information
rauchg committed Jun 27, 2011
2 parents 969743c + 558d12e commit 06052d2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
11 changes: 6 additions & 5 deletions dist/socket.io.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@
}

if (!options['force new connection'] && socket) {
this.sockets[uuri] = socket;
io.sockets[uuri] = socket;
}

socket = socket || this.sockets[uuri];
socket = socket || io.sockets[uuri];

// if path is different from '' or /
return socket.of(uri.path.length > 1 ? uri.path : '');
Expand Down Expand Up @@ -1248,7 +1248,7 @@
}

if (packet.type == 'connect' && packet.endpoint == ''){
return this.onConnect();
this.onConnect();
}

this.socket.onPacket(packet);
Expand Down Expand Up @@ -1750,7 +1750,7 @@
// make sure to flush the buffer
this.setBuffer(false);
}
this.publish('connect');
this.emit('connect');
};

/**
Expand Down Expand Up @@ -3386,7 +3386,6 @@ var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="Sho
form.style.left = '-1000px';
form.target = id;
form.method = 'POST';
form.action = this.prepareUrl() + '?t=' + (+new Date) + '&i=' + this.index;
area.name = 'd';
form.appendChild(area);
document.body.appendChild(form);
Expand All @@ -3395,6 +3394,8 @@ var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="Sho
this.area = area;
}

this.form.action = this.prepareUrl() + '?t=' + (+new Date) + '&i=' + this.index;

function complete () {
initIframe();
self.socket.setBuffer(false);
Expand Down
Loading

0 comments on commit 06052d2

Please sign in to comment.