web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the rename feature in drive not working with tables

Browse Source
This commit is contained in:
yflory 2017-01-26 14:51:59 +01:00
parent 3f44444f41
commit fb48484d2a
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/drive/file.css
View File

@ -194,7 +194,7 @@ span.fa-folder-open {
margin-left: 10px; margin-left: 10px;
float: right; float: right;
} }
#content li:not(.header) * { #content li:not(.header) *:not(input) {
pointer-events: none; pointer-events: none;
} }
#content li:not(.header):hover .name { #content li:not(.header):hover .name {

2
www/drive/file.less
View File

@ -235,7 +235,7 @@ span {
} }
li { li {
&:not(.header) { &:not(.header) {
* { *:not(input) {
pointer-events: none; pointer-events: none;
} }
&:hover { &:hover {

16
www/drive/main.js
View File

@ -235,7 +235,7 @@ define([
$iframe.find('.selected').removeClass("selected"); $iframe.find('.selected').removeClass("selected");
}; };
var removeInput = function () { var removeInput = function () {
$iframe.find('li > span:hidden').attr('style', undefined); $iframe.find('li > span:hidden').removeAttr('style');
$iframe.find('li > input').remove(); $iframe.find('li > input').remove();
}; };
@ -280,7 +280,8 @@ define([
} }
removeInput(); removeInput();
removeSelected(); removeSelected();
$element.hide(); var $name = $element.find('.name');
$name.hide();
var name = path[path.length - 1]; var name = path[path.length - 1];
var $input = $('<input>', { var $input = $('<input>', {
placeholder: name, placeholder: name,
@ -295,7 +296,7 @@ define([
} }
}); });
//$element.parent().append($input); //$element.parent().append($input);
$element.after($input); $name.after($input);
$input.focus(); $input.focus();
$input.select(); $input.select();
// We don't want to open the file/folder when clicking on the input // We don't want to open the file/folder when clicking on the input
@ -311,10 +312,12 @@ define([
}); });
// Make the parent element non-draggable when selecting text in the field // Make the parent element non-draggable when selecting text in the field
// since it would remove the input // since it would remove the input
$input.on('mousedown', function () { $input.on('mousedown', function (e) {
e.stopPropagation();
$input.parents('li').attr("draggable", false); $input.parents('li').attr("draggable", false);
}); });
$input.on('mouseup', function () { $input.on('mouseup', function (e) {
e.stopPropagation();
$input.parents('li').attr("draggable", true); $input.parents('li').attr("draggable", true);
}); });
}; };
@ -322,6 +325,7 @@ define([
// Add the "selected" class to the "li" corresponding to the clicked element // Add the "selected" class to the "li" corresponding to the clicked element
var onElementClick = function (e, $element, path) { var onElementClick = function (e, $element, path) {
// If "Ctrl" is pressed, do not remove the current selection // If "Ctrl" is pressed, do not remove the current selection
removeInput();
if (!e || !e.ctrlKey) { if (!e || !e.ctrlKey) {
removeSelected(); removeSelected();
} }
@ -713,7 +717,7 @@ define([
var isNewFolder = module.newFolder && filesOp.comparePath(newPath, module.newFolder); var isNewFolder = module.newFolder && filesOp.comparePath(newPath, module.newFolder);
if (isNewFolder) { if (isNewFolder) {
appStatus.onReady(function () { appStatus.onReady(function () {
window.setTimeout(function () { displayRenameInput($name, newPath); }, 0); window.setTimeout(function () { displayRenameInput($element, newPath); }, 0);
}); });
delete module.newFolder; delete module.newFolder;
} }