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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
yflory 2017-11-23 12:29:32 +01:00
commit 4b5abdecbe
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
check-accounts.js
View File

@ -1,3 +1,4 @@
/* globals Buffer */
var Https = require('https'); var Https = require('https');
var Config = require("./config.js"); var Config = require("./config.js");
var Package = require("./package.json"); 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$/)) { if (!('' + response.statusCode).match(/^2\d\d$/)) {
throw new Error('SERVER ERROR ' + response.statusCode); throw new Error('SERVER ERROR ' + response.statusCode);
} }

3
www/drive/inner.js
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();