mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-06-16 19:24:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Merge branch 'develop' of github.com:ether/etherpad-lite into store-sessions-in-db

Browse source
This commit is contained in:
John McLear 2013-02-17 23:44:26 +00:00
commit 6d7e709ecb
14 changed files with 104 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/node/handler/APIHandler.js
View file

@ -216,6 +216,9 @@ var version =
}
};
// set the latest available API version here
exports.latestApiVersion = '1.2.7';
/**
* Handles a HTTP API call
* @param functionName the name of the called function

2
src/node/handler/PadMessageHandler.js
View file

@ -1429,7 +1429,7 @@ function composePadChangesets(padId, startNum, endNum, callback)
*/
exports.padUsersCount = function (padID, callback) {
callback(null, {
padUsersCount: socketio.sockets.clients(padId).length
padUsersCount: socketio.sockets.clients(padID).length
});
}

5
src/node/hooks/express/apicalls.js
View file

@ -57,4 +57,9 @@ exports.expressCreateServer = function (hook_name, args, cb) {
res.end("OK");
});
});
//Provide a possibility to query the latest available API version
args.app.get('/api', function (req, res) {
res.json({"currentVersion" : apiHandler.latestApiVersion});
});
}