infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix merge issues

pull/1/head
yflory 2021-01-07 12:47:17 +01:00
parent beb74b46d5
commit 1f98ad94cc
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/sframe-common.js
View File

@ -16,7 +16,6 @@ define([
'/common/metadata-manager.js',
'/customize/application_config.js',
'/common/outer/cache-store.js',
'/common/common-realtime.js',
'/common/common-util.js',
'/common/common-hash.js',
@ -42,7 +41,6 @@ define([
MT,
MetadataMgr,
AppConfig,
Cache,
CommonRealtime,
Util,
Hash,
@ -189,7 +187,7 @@ define([
funcs.getFileSize = function (channelId, cb) {
nThen(function (waitFor) {
Cache.getBlobCache(channelId, waitFor(function(err, blob) {
ctx.cache.getBlobCache(channelId, waitFor(function(err, blob) {
if (err) { return; }
waitFor.abort();
cb(null, blob.length);