Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
This commit is contained in:
commit
4b5abdecbe
@ -1,3 +1,4 @@
|
||||
/* globals Buffer */
|
||||
var Https = require('https');
|
||||
var Config = require("./config.js");
|
||||
var Package = require("./package.json");
|
||||
@ -18,7 +19,7 @@ var options = {
|
||||
}
|
||||
};
|
||||
|
||||
var req = Https.request(options, function (response) {
|
||||
Https.request(options, function (response) {
|
||||
if (!('' + response.statusCode).match(/^2\d\d$/)) {
|
||||
throw new Error('SERVER ERROR ' + response.statusCode);
|
||||
}
|
||||
|
||||
@ -579,6 +579,7 @@ define([
|
||||
$input.on('keydown', function (e) { e.stopPropagation(); });
|
||||
|
||||
$input.on('keyup', function (e) {
|
||||
e.stopPropagation();
|
||||
if (e.which === 13) {
|
||||
removeInput(true);
|
||||
filesOp.rename(path, $input.val(), refresh);
|
||||
@ -587,7 +588,7 @@ define([
|
||||
if (e.which === 27) {
|
||||
removeInput(true);
|
||||
}
|
||||
});
|
||||
}).on('keypress', function (e) { e.stopPropagation(); });
|
||||
//$element.parent().append($input);
|
||||
$name.after($input);
|
||||
$input.focus();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user