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 2019-04-12 17:24:36 +02:00
commit 24c4029922
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.example.js
View File

@ -132,7 +132,8 @@ module.exports = {
'contact', 'contact',
'what-is-cryptpad', 'what-is-cryptpad',
'features', 'features',
'faq' 'faq',
'maintenance'
], ],
/* ===================== /* =====================

40
customize.dist/maintenance.html Normal file
View File

@ -0,0 +1,40 @@
<!DOCTYPE html>
<html>
<head>
<title data-localization="main_title">CryptPad: Zero Knowledge, Collaborative Real Time Editing</title>
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
<style>
html {
height: 100%;
}
body {
transition: opacity 0.75s, visibility 0s 0.75s;
visibility: visible;
position: fixed;
z-index: 10000000;
top: 0px;
bottom: 0px;
left: 0px;
right: 0px;
background: linear-gradient(to right, #326599 0%, #326599 50%, #4591c4 50%, #4591c4 100%);
color: #fafafa;
font-size: 1.5em;
opacity: 1;
display: flex;
flex-flow: column;
justify-content: center;
align-items: center;
font-family: monospace;
}
#cp-logo {
max-width: 300px;
}
</style>
</head>
<body class="html">
<img id="cp-logo" src="/customize/loading-logo.png">
<h1>Maintenance</h1>
<h3>We are currently upgrading CryptPad. We will be back shortly!</h3>

4
www/common/outer/serviceworker.js
View File

@ -18,6 +18,9 @@ var debug = function (msg) { console.log(msg); };
var init = function (client, cb) { var init = function (client, cb) {
debug('SW INIT'); debug('SW INIT');
require.config({
waitSeconds: 600
});
require(['/api/config?cb=' + (+new Date()).toString(16)], function (ApiConfig) { require(['/api/config?cb=' + (+new Date()).toString(16)], function (ApiConfig) {
if (ApiConfig.requireConf) { require.config(ApiConfig.requireConf); } if (ApiConfig.requireConf) { require.config(ApiConfig.requireConf); }
@ -105,6 +108,7 @@ var init = function (client, cb) {
Rpc._subscribeToMessenger(clientId); Rpc._subscribeToMessenger(clientId);
} }
if (data && data.state === "ALREADY_INIT") { if (data && data.state === "ALREADY_INIT") {
self.store = data.returned;
return void cb(data.returned); return void cb(data.returned);
} }
self.store = data; self.store = data;