mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1797 from nextcloud/issue-1791-show-path-on-filename-conflict 

Show the path, when the filename conflicts
This commit is contained in:
Morris Jobke 2016-10-20 00:27:54 +02:00 committed by GitHub
parent ba0cab72ef 6f2fe8c62a
commit 195c53b7a6
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files/css/files.css
View File

@ -148,10 +148,10 @@ table tr.mouseOver td {
}
tbody a { color:#000; }
span.extension, span.uploading, td.date {
span.conflict-path, span.extension, span.uploading, td.date {
color: #999;
}
span.extension {
span.conflict-path, span.extension {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
filter: alpha(opacity=70);
opacity: .7;
@ -161,6 +161,8 @@ span.extension {
transition: opacity 300ms;
vertical-align: top;
}
tr:hover span.conflict-path,
tr:focus span.conflict-path,
tr:hover span.extension,
tr:focus span.extension {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";

22
apps/files/js/filelist.js
View File

@ -1148,6 +1148,28 @@
}
var nameSpan=$('<span></span>').addClass('nametext');
var innernameSpan = $('<span></span>').addClass('innernametext').text(basename);
if (path && path !== '/') {
var conflictingItems = this.$fileList.find('tr[data-file="' + name.replace( /(:|\.|\[|\]|,|=)/g, "\\$1") + '"]');
if (conflictingItems.length !== 0) {
if (conflictingItems.length === 1) {
// Update the path on the first conflicting item
var $firstConflict = $(conflictingItems[0]),
firstConflictPath = $firstConflict.attr('data-path') + '/';
if (firstConflictPath.charAt(0) === '/') {
firstConflictPath = firstConflictPath.substr(1);
}
$firstConflict.find('td.filename span.innernametext').prepend($('<span></span>').addClass('conflict-path').text(firstConflictPath));
}
var conflictPath = path + '/';
if (conflictPath.charAt(0) === '/') {
conflictPath = conflictPath.substr(1);
}
nameSpan.append($('<span></span>').addClass('conflict-path').text(conflictPath));
}
}
nameSpan.append(innernameSpan);
linkElem.append(nameSpan);
if (extension) {