Make args order consistent

This commit is contained in:
Alasdair Smith 2017-09-21 16:56:09 +01:00
parent 3966e2f85b
commit 90d05dc6dd
2 changed files with 2 additions and 2 deletions

View file

@ -102,7 +102,7 @@ module.exports = Router =
logger.error { arguments: arguments }, "unexpected arguments"
return {} # ????
WebsocketController.joinDoc client, doc_id, options, fromVersion, (err, args...) ->
WebsocketController.joinDoc client, doc_id, fromVersion, options, (err, args...) ->
if err?
Router._handleError callback, err, client, "joinDoc", {doc_id, fromVersion}
else

View file

@ -80,7 +80,7 @@ module.exports = WebsocketController =
callback()
, WebsocketController.FLUSH_IF_EMPTY_DELAY
joinDoc: (client, doc_id, options, fromVersion = -1, callback = (error, doclines, version, ops, ranges) ->) ->
joinDoc: (client, doc_id, fromVersion = -1, options, callback = (error, doclines, version, ops, ranges) ->) ->
metrics.inc "editor.join-doc"
Utils.getClientAttributes client, ["project_id", "user_id"], (error, {project_id, user_id}) ->
return callback(error) if error?