diff options
| author | Tomasz Grobelny <tomasz@grobelny.net> | 2018-11-22 22:19:57 +0100 |
|---|---|---|
| committer | Tomasz Grobelny <tomasz@grobelny.net> | 2018-11-24 23:57:13 +0100 |
| commit | 04d326f95feacd640dc5d6fecff1ec0ef0970265 (patch) | |
| tree | 3a70b2313d782daf410bf75f4893c1e868af7d8c /apps/files/js | |
| parent | c83c26877b38a83e01f5b94ef975c8be115cb950 (diff) | |
| download | nextcloud-server-04d326f95feacd640dc5d6fecff1ec0ef0970265.tar.gz nextcloud-server-04d326f95feacd640dc5d6fecff1ec0ef0970265.zip | |
Fix unit tests
Signed-off-by: Tomasz Grobelny <tomasz@grobelny.net>
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/filelist.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 5ed08760e6a..7fc460017bb 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -2132,6 +2132,9 @@ options = options || {}; var fileEl = this.findFileEl(name); var fileData = _.findWhere(this.files, {name: name}); + if (!fileData) { + return; + } var fileId = fileData.id; if (this._selectedFiles[fileId]) { // remove from selection first @@ -2227,7 +2230,7 @@ return self.filesClient.move(dir + fileName, targetPath + fileName) .done(function() { // if still viewing the same directory - if (OC.joinPaths(self.getCurrentDirectory(), '/') === dir) { + if (OC.joinPaths(self.getCurrentDirectory(), '/') === OC.joinPaths(dir, '/')) { // recalculate folder size var oldFile = self.findFileEl(target); var newFile = self.findFileEl(fileName); @@ -2367,7 +2370,7 @@ filesToNotify.push(fileName); // if still viewing the same directory - if (OC.joinPaths(self.getCurrentDirectory(), '/') === dir) { + if (OC.joinPaths(self.getCurrentDirectory(), '/') === OC.joinPaths(dir, '/')) { // recalculate folder size var oldFile = self.findFileEl(target); var newFile = self.findFileEl(fileName); @@ -2869,14 +2872,14 @@ self.showFileBusyState($tr, true); return self.filesClient.remove(dir + '/' + fileName) .done(function() { - if (OC.joinPaths(self.getCurrentDirectory(), '/') === dir) { + if (OC.joinPaths(self.getCurrentDirectory(), '/') === OC.joinPaths(dir, '/')) { self.remove(fileName); } }) .fail(function(status) { if (status === 404) { // the file already did not exist, remove it from the list - if (OC.joinPaths(self.getCurrentDirectory(), '/') === dir) { + if (OC.joinPaths(self.getCurrentDirectory(), '/') === OC.joinPaths(dir, '/')) { self.remove(fileName); } } else { |