Remove User.respond() and call jsonp() directly.

Esse commit está contido em:
Daniel Howard
2014-06-27 14:07:47 -07:00
commit d6caf96690
3 arquivos alterados com 5 adições e 9 exclusões
+1 -1
Ver Arquivo
@@ -77,7 +77,7 @@ app.use('/app/status', function(req, res) {
app.use('/app/noop', function(req, res) { app.use('/app/noop', function(req, res) {
req.event._status = {sent: true}; req.event._status = {sent: true};
res.session.respond(res, req.event); res.jsonp(req.event);
}); });
app.use('/app/signoff', function(req, res) { app.use('/app/signoff', function(req, res) {
+3 -3
Ver Arquivo
@@ -112,10 +112,10 @@ Hub.prototype.message = function(res, to, event) {
try { try {
to.send(event); to.send(event);
event._status = {sent: true}; event._status = {sent: true};
res.session.respond(res, event); res.jsonp(event);
} catch(e) { } catch(e) {
event._status = {sent: false, e: e.description}; event._status = {sent: false, e: e.description};
res.session.respond(res, event); res.jsonp(event);
} }
}; };
@@ -127,6 +127,6 @@ Hub.prototype.signOff = function(sid, res, event) {
} }
event._status = {sent: true}; event._status = {sent: true};
if (res) { if (res) {
res.session.respond(res, event); res.jsonp(event);
} }
}; };
+1 -5
Ver Arquivo
@@ -56,10 +56,6 @@ User.prototype.listener = function(conn) {
this.listeners.push(conn); this.listeners.push(conn);
}; };
User.prototype.respond = function(res, event) {
this._send('connection', event, res);
};
User.prototype.send = function(event) { User.prototype.send = function(event) {
this._send('listener', event); this._send('listener', event);
}; };
@@ -101,6 +97,6 @@ User.prototype.status = function(res, event) {
this.events.emit('status', event.status, event.message); this.events.emit('status', event.status, event.message);
event._status = {sent: true}; event._status = {sent: true};
if (res) { if (res) {
this.respond(res, event); res.jsonp(event);
} }
}; };