Merge branch 'soon' into staging

This commit is contained in:
ansuz 2017-11-22 17:38:49 +01:00
commit 98c2b0c802

View File

@ -579,6 +579,7 @@ define([
$input.on('keydown', function (e) { e.stopPropagation(); }); $input.on('keydown', function (e) { e.stopPropagation(); });
$input.on('keyup', function (e) { $input.on('keyup', function (e) {
e.stopPropagation();
if (e.which === 13) { if (e.which === 13) {
removeInput(true); removeInput(true);
filesOp.rename(path, $input.val(), refresh); filesOp.rename(path, $input.val(), refresh);
@ -587,7 +588,7 @@ define([
if (e.which === 27) { if (e.which === 27) {
removeInput(true); removeInput(true);
} }
}); }).on('keypress', function (e) { e.stopPropagation(); });
//$element.parent().append($input); //$element.parent().append($input);
$name.after($input); $name.after($input);
$input.focus(); $input.focus();