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

Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2

Browse Source
This commit is contained in:
yflory
2017-03-02 10:53:48 +01:00
parent b32d698291 91eda5fa83
commit 6b8d0c8bc7
41 changed files with 129 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
www/slide/index.html
View File

@@ -3,13 +3,7 @@
<head>
<title>CryptPad</title>
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
<script>
require.config({
waitSeconds: 60,
urlArgs: "bust=1.1.0",
});
</script>
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
<link rel="icon" type="image/png"
href="/customize/main-favicon.png"
@@ -52,11 +46,7 @@
</head>
<body>
<div id="iframe-container">
<iframe id="pad-iframe"></iframe>
<script>
document.getElementById('pad-iframe').setAttribute('src', 'inner.html?' + new Date().getTime());
</script>
<iframe id="pad-iframe"></iframe><script src="/common/noscriptfix.js"></script>
</div>
</body>
</html>

4
www/slide/main.js
View File

@@ -771,7 +771,7 @@ define([
// inform of network disconnect
setEditable(false);
toolbar.failed();
Cryptpad.alert(Messages.common_connectionLost);
Cryptpad.alert(Messages.common_connectionLost, undefined, true);
};
var onConnectionChange = config.onConnectionChange = function (info) {
@@ -782,7 +782,7 @@ define([
toolbar.reconnecting(info.myId);
Cryptpad.findOKButton().click();
} else {
Cryptpad.alert(Messages.common_connectionLost);
Cryptpad.alert(Messages.common_connectionLost, undefined, true);
}
};