YUKI Hiroshi
null+****@clear*****
Thu Aug 1 15:50:43 JST 2013
YUKI Hiroshi 2013-08-01 15:50:43 +0900 (Thu, 01 Aug 2013) New Revision: 98e48ce604c9105d2e19df7d4c9ad4d29ae334b4 https://github.com/groonga/express-droonga/commit/98e48ce604c9105d2e19df7d4c9ad4d29ae334b4 Message: Apply client options correctly Modified files: lib/adapter/socket.io.js lib/adapter/wrapper.js Modified: lib/adapter/socket.io.js (+5 -3) =================================================================== --- lib/adapter/socket.io.js 2013-08-01 15:47:55 +0900 (b49cd53) +++ lib/adapter/socket.io.js 2013-08-01 15:50:43 +0900 (3227274) @@ -64,11 +64,13 @@ exports.register = function(application, server, params) { var responseEvent = envelope.type; var responseData = envelope.body; - - var wrappedSocket = new wrapper.SocketIOClientSocketWrapper(socket); - if (clientOptions.responseEvent) + var options = {}; + if (clientOptions.responseEvent) { responseEvent = clientOptions.responseEvent; + options.event = responseEvent; + } + var wrappedSocket = new wrapper.SocketIOClientSocketWrapper(socket, options); if (commandDefinition[responseHandler]) { try { commandDefinition[responseHandler](responseData, wrappedSocket); Modified: lib/adapter/wrapper.js (+4 -1) =================================================================== --- lib/adapter/wrapper.js 2013-08-01 15:47:55 +0900 (5b24fff) +++ lib/adapter/wrapper.js 2013-08-01 15:50:43 +0900 (79e4a4e) @@ -16,11 +16,14 @@ DroongaProtocolConnectionWrapper.prototype = { exports.DroongaProtocolConnectionWrapper = DroongaProtocolConnectionWrapper; -function SocketIOClientSocketWrapper(socket) { +function SocketIOClientSocketWrapper(socket, options) { this._socket = socket; + this._options = options || {}; } SocketIOClientSocketWrapper.prototype = { emit: function(event, data) { + if (this._options.event) + event = this._options.event; this._socket.emit(event, data); }, destroy: function() { -------------- next part -------------- HTML����������������������������...Download