From 8c20c7823e659317f3a4a6ff0aed66b586750037 Mon Sep 17 00:00:00 2001 From: yflory Date: Thu, 19 Jul 2018 15:32:45 +0200 Subject: [PATCH] Empty trash callback was missing --- www/common/proxy-manager.js | 3 ++- www/common/userObject.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js index 622eacbf0..38d00e6a2 100644 --- a/www/common/proxy-manager.js +++ b/www/common/proxy-manager.js @@ -753,7 +753,8 @@ define([ }; var emptyTrashInner = function (Env, cb) { return void Env.sframeChan.query("Q_DRIVE_USEROBJECT", { - cmd: "emptyTrash" + cmd: "emptyTrash", + data: null }, cb); }; var addFolderInner = function (Env, path, name, cb) { diff --git a/www/common/userObject.js b/www/common/userObject.js index 45769b2fd..d4f994cdc 100644 --- a/www/common/userObject.js +++ b/www/common/userObject.js @@ -595,14 +595,14 @@ define([ //if (typeof cb === "function") { cb(); } }; exp.emptyTrash = function (cb) { + cb = cb || function () {}; if (sframeChan) { return void sframeChan.query("Q_DRIVE_USEROBJECT", { cmd: "emptyTrash" }, cb); } files[TRASH] = {}; - exp.checkDeletedFiles(); - if(cb) { cb(); } + exp.checkDeletedFiles(false, cb); }; // RENAME