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-16 14:41:51 +02:00
parent 953e7155f0 517438d7c5
commit fe0f21594a
7 changed files with 390 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -785,7 +785,7 @@ define([
var $container = $('<span>', {'class':'limit-container'});
if (!data) {
return void window.setTimeout(function () {
Cryptpad.isOverPinLimit(todo);
common.isOverPinLimit(todo);
}, LIMIT_REFRESH_RATE);
}
var usage = data.usage;
@@ -816,11 +816,11 @@ define([
$text.text(usage + ' / ' + limit + ' ' + unit);
$limit.append($usage).append($text);
window.setTimeout(function () {
Cryptpad.isOverPinLimit(todo);
common.isOverPinLimit(todo);
}, LIMIT_REFRESH_RATE);
cb(err, $container);
};
Cryptpad.isOverPinLimit(todo);
common.isOverPinLimit(todo);
};
common.createButton = function (type, rightside, data, callback) {