blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix copy bug from drive to drive

Browse source
This commit is contained in:
ClemDee 2019-07-04 11:02:16 +02:00
parent 28d8f447d0
commit f719ea53ac
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
www/common/proxy-manager.js
View file

@ -314,7 +314,7 @@ define([
// Move from the main drive
if (!newResolved.id) {
// Move from the main drive to the main drive
Env.user.userObject.move(resolved.main, newResolved.path, waitFor());
Env.user.userObject.move(resolved.main, newResolved.path, copy, waitFor());
} else {
// Move from the main drive to a shared folder
@ -354,7 +354,7 @@ define([
var paths = resolved.folders[fId];
if (newResolved.id === fId) {
// Move to the same shared folder
newResolved.userObject.move(paths, newResolved.path, waitFor());
newResolved.userObject.move(paths, newResolved.path, copy, waitFor());
} else {
// Move to a different shared folder or to main drive
var uoFrom = Env.folders[fId].userObject;

3
www/common/userObject.js
View file

@ -582,7 +582,7 @@ define([
};
// MOVE
var move = exp.move = function (paths, newPath, cb) {
var move = exp.move = function (paths, newPath, copy, cb) {
if (sframeChan) {
return void sframeChan.query("Q_DRIVE_USEROBJECT", {
cmd: "move",
@ -607,6 +607,7 @@ define([
toRemove.push(p);
}
});
if (copy) { return void cb(); }
exp.delete(toRemove, cb);
};
exp.restore = function (path, cb) {