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:
ansuz 2018-07-06 11:37:00 +02:00
commit 4ef2cfa88d
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server.js
View File

@ -165,7 +165,7 @@ app.get('/api/config', function(req, res){
res.send('define(function(){\n' + [ res.send('define(function(){\n' + [
'var obj = ' + JSON.stringify({ 'var obj = ' + JSON.stringify({
requireConf: { requireConf: {
waitSeconds: 60, waitSeconds: 600,
urlArgs: 'ver=' + Package.version + (FRESH_KEY? '-' + FRESH_KEY: '') + (DEV_MODE? '-' + (+new Date()): ''), urlArgs: 'ver=' + Package.version + (FRESH_KEY? '-' + FRESH_KEY: '') + (DEV_MODE? '-' + (+new Date()): ''),
}, },
removeDonateButton: (config.removeDonateButton === true), removeDonateButton: (config.removeDonateButton === true),

4
www/common/sframe-common-outer.js
View File

@ -188,13 +188,13 @@ define([
if (val) { if (val) {
password = val; password = val;
Cryptpad.getFileSize(window.location.href, password, function (e, size) { Cryptpad.getFileSize(window.location.href, password, waitFor(function (e, size) {
if (size !== 0) { if (size !== 0) {
return void todo(); return void todo();
} }
// Wrong password or deleted file? // Wrong password or deleted file?
askPassword(true); askPassword(true);
}); }));
} else { } else {
askPassword(); askPassword();
} }

9
www/common/userObject.js
View File

@ -37,7 +37,14 @@ define([
var logError = config.logError || logging; var logError = config.logError || logging;
var debug = exp.debug = config.debug || logging; var debug = exp.debug = config.debug || logging;
var error = exp.error = function() { var error = exp.error = function() {
exp.fixFiles(); if (sframeChan) {
return void sframeChan.query("Q_DRIVE_USEROBJECT", {
cmd: "fixFiles",
data: {}
}, function () {});
} else if (typeof (exp.fixFiles) === "function") {
exp.fixFiles();
}
console.error.apply(console, arguments); console.error.apply(console, arguments);
}; };