never show '/' as path for conflicting file names

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 857865c711109e8a68115a0cd85bcc46b651bdaf..bdd4a6ffc375ca5210813a9c17b8b624082f0eeb 100644 (file)
--- 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($('<span></span>').addClass('conflict-path').text(firstConflictPath));
+                                       if (firstConflictPath && firstConflictPath !== '/') {
+                                               $firstConflict.find('td.filename span.innernametext').prepend($('<span></span>').addClass('conflict-path').text(firstConflictPath));
+                                       }
                                }
 
                                var conflictPath = path + '/';