web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
yflory
2017-05-15 18:21:25 +02:00
parent 7ee6864ea4 1542aa96bc
commit c1b43db363
4 changed files with 129 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
www/common/cryptpad-common.js
View File

@@ -744,13 +744,20 @@ define([
common.updatePinLimit = function (cb) {
if (!pinsReady()) { return void cb('[RPC_NOT_READY]'); }
rpc.updatePinLimits(cb);
rpc.updatePinLimits(function (e, limit) {
if (e) { return cb(e); }
var MB = common.bytesToMegabytes(limit);
cb(e, MB);
});
};
common.getPinLimit = function (cb) {
if (!pinsReady()) { return void cb('[RPC_NOT_READY]'); }
cb(void 0, typeof(AppConfig.pinLimit) === 'number'? AppConfig.pinLimit: 1000);
//rpc.getLimit(cb); TODO
rpc.getLimit(function (e, limit) {
if (e) { return cb(e); }
var MB = common.bytesToMegabytes(limit);
cb(void 0, MB);
});
};
common.isOverPinLimit = function (cb) {