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

Implement stronger content-security-policy except in /pad/ which does not allow it.

Browse Source 
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
This commit is contained in:
Caleb James DeLisle
2017-03-01 17:23:34 +01:00
parent 9800f036c5
commit 91eda5fa83
34 changed files with 107 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
www/drive/index.html
View File

@@ -10,13 +10,7 @@
data-alt-favicon="/customize/alt-favicon.png"
id="favicon" />
<link rel="stylesheet" href="/customize/main.css" />
<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>
<style>
html, body {
margin: 0px;
@@ -38,10 +32,6 @@
</style>
</head>
<body>
<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>
</body>
</html>

2
www/drive/main.js
View File

@@ -18,7 +18,6 @@ define([
// Use `$(function () {});` to make sure the html is loaded before doing anything else
$(function () {
var $iframe = $('#pad-iframe').contents();
var ifrw = $('#pad-iframe')[0].contentWindow;
@@ -2116,6 +2115,5 @@ define([
onConnectError();
}
});
});
});