From fe6b4d432b5b3232fe3dd9c928d9c0efdba3d3be Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 18 Oct 2017 15:16:51 +0200 Subject: [PATCH] never show '/' as path for conflicting file names Signed-off-by: Robin Appelman --- apps/files/js/filelist.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 857865c7111..bdd4a6ffc37 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1214,7 +1214,9 @@ if (firstConflictPath.charAt(0) === '/') { firstConflictPath = firstConflictPath.substr(1); } - $firstConflict.find('td.filename span.innernametext').prepend($('').addClass('conflict-path').text(firstConflictPath)); + if (firstConflictPath && firstConflictPath !== '/') { + $firstConflict.find('td.filename span.innernametext').prepend($('').addClass('conflict-path').text(firstConflictPath)); + } } var conflictPath = path + '/'; -- 2.39.5