diff --git a/www/admin/inner.js b/www/admin/inner.js index a4762bf50..597f8a7f3 100644 --- a/www/admin/inner.js +++ b/www/admin/inner.js @@ -196,7 +196,7 @@ define([ waitFor.abort(); return void UI.warn(Messages.admin_archiveInval); } - })); + }), true); }).nThen(function () { sFrameChan.query('Q_ADMIN_RPC', { cmd: archive ? 'ARCHIVE_DOCUMENT' : 'RESTORE_ARCHIVED_DOCUMENT', diff --git a/www/common/inner/properties.js b/www/common/inner/properties.js index da527c8e4..f5780d4c2 100644 --- a/www/common/inner/properties.js +++ b/www/common/inner/properties.js @@ -91,7 +91,7 @@ define([ console.error(e); } bytes += _bytes; - })); + }), true); }); if (!owned) { return; } diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js index 8a3328d8a..c60402e7b 100644 --- a/www/common/sframe-common.js +++ b/www/common/sframe-common.js @@ -185,8 +185,9 @@ define([ }); }; - funcs.getFileSize = function (channelId, cb) { + funcs.getFileSize = function (channelId, cb, noCache) { nThen(function (waitFor) { + if (channelId.length < 48 || noCache) { return; } ctx.cache.getBlobCache(channelId, waitFor(function(err, blob) { if (err) { return; } waitFor.abort();