infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Select the element after clicking 'show in folder' in the drive search

pull/1/head
yflory 2017-09-18 15:24:25 +02:00
parent 5c405090e1
commit a1e7bf701d
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/common/userObject.js
View File

@ -446,6 +446,7 @@ define([
res.forEach(function (l) {
//var paths = findFile(l);
ret.push({
id: l,
paths: findFile(l),
data: exp.getFileData(l)
});

15
www/drive/main.js
View File

@ -1198,6 +1198,13 @@ define([
draggable: true,
'class': 'element-row'
});
if (!isFolder && Array.isArray(APP.selectedFiles)) {
var idx = APP.selectedFiles.indexOf(element);
if (idx !== -1) {
$element.addClass('selected');
APP.selectedFiles.splice(idx, 1);
}
}
if (isFolder) {
addFolderData(element, key, $element);
} else {
@ -1751,6 +1758,13 @@ define([
'class': 'file-element element element-row' + roClass,
draggable: draggable
});
if (Array.isArray(APP.selectedFiles)) {
var idx = APP.selectedFiles.indexOf(id);
if (idx !== -1) {
$element.addClass('selected');
APP.selectedFiles.splice(idx, 1);
}
}
addFileData(id, $element);
$element.prepend($icon).dblclick(function () {
openFile(id);
@ -1864,6 +1878,7 @@ define([
e.preventDefault();
if (filesOp.isInTrashRoot(parentPath)) { parentPath = [TRASH]; }
else { parentPath.pop(); }
APP.selectedFiles = [r.id];
module.displayDirectory(parentPath);
});
}