This commit is contained in:
Jon Lambson 2017-10-26 17:24:24 -06:00
parent 1b65c78093
commit ae50d3dd14
1 changed files with 11 additions and 3 deletions

View File

@ -233,7 +233,9 @@ app.controller('websiteCtrl', [
}
opts.progress.uploadTotal = 0;
vm.buildNotification(result, msg);
vm.Sites.contents(vm.copyR, vm.previousSearchQuery);
vm.cleanArrays();
vm.Sites.allContents(vm.copyR);
// vm.Sites.contents(vm.copyR, vm.previousSearchQuery);
});
};
@ -529,6 +531,7 @@ app.controller('websiteCtrl', [
};
vm.triggerDeleteFolder = function (path, r) {
vm.deletedFolder = true;
path = cleanPathQuery(path);
var opts = {
path: path
@ -559,9 +562,13 @@ app.controller('websiteCtrl', [
var msg = "'"+ vm.pathRemoved + "'" + ' has been removed.';
vm.buildNotification(result, msg);
if (deletedFolder) {
vm.Sites.contents(vm.copyR, vm.previousSearchQuery);
vm.cleanArrays();
vm.Sites.allContents(vm.copyR);
// vm.Sites.contents(vm.copyR, vm.previousSearchQuery);
} else {
vm.Sites.contents(vm.copyR, vm.previousSearchQuery);
vm.cleanArrays();
vm.Sites.allContents(vm.copyR);
// vm.Sites.contents(vm.copyR, vm.previousSearchQuery);
}
});
};
@ -618,6 +625,7 @@ app.controller('websiteCtrl', [
vm.count = 0;
vm.isRoot = true;
vm.deletedFolder = false;
vm.Sites.upload = function (r) {
var pkg = Auth.oauth3.pkg('www@daplie.com');
//analyzeFile(r.newFile, r);