Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

This commit is contained in:
yflory 2018-01-23 14:36:20 +01:00
commit 492fcf0bb6

View File

@ -387,11 +387,15 @@ export type ChainPadServer_Storage_t = {
getChannelMetadata: (channelName:string, cb:(err:?Error|string, data:?any)=>void)=>void, getChannelMetadata: (channelName:string, cb:(err:?Error|string, data:?any)=>void)=>void,
clearChannel: (channelName:string, (err:?Error)=>void)=>void clearChannel: (channelName:string, (err:?Error)=>void)=>void
}; };
const flow_Config = require('../config.example.js'); export type ChainPadServer_Config_t = {
type Config_t = typeof(flow_Config); verbose?: boolean,
filePath?: string,
channelExpirationMs?: number,
openFileLimit?: number
};
*/ */
module.exports.create = function ( module.exports.create = function (
conf /*:Config_t*/, conf /*:ChainPadServer_Config_t*/,
cb /*:(store:ChainPadServer_Storage_t)=>void*/ cb /*:(store:ChainPadServer_Storage_t)=>void*/
) { ) {
var env = { var env = {