infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix iframe URL caching

Browse Source
pull/1/head
yflory 4 years ago
parent 9756e87f1b
commit e4dbd04103
25 changed files with 46 additions and 67 deletions
Show Stats Download Patch File Download Diff File

2
customize.dist/src/outer.css
Unescape Escape View File

@ -7,7 +7,7 @@ html, body {
background: black; background: black;
} }
} }
#sbox-iframe, #sbox-secure-iframe { iframe-placeholder, #sbox-iframe, #sbox-secure-iframe {
position: fixed; position: fixed;
top:0; left:0; top:0; left:0;
bottom:0; right:0; bottom:0; right:0;

4
www/admin/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

4
www/code/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

1
www/common/boot2.js
Unescape Escape View File

@ -14,6 +14,7 @@ try {
var os = isDarkOS() ? 'dark' : 'light'; var os = isDarkOS() ? 'dark' : 'light';
var key = 'CRYPTPAD_STORE|colortheme'; var key = 'CRYPTPAD_STORE|colortheme';
window.CryptPad_theme = localStorage[key] || os; window.CryptPad_theme = localStorage[key] || os;
console.error(localStorage[key], os);
if (!localStorage[key]) { if (!localStorage[key]) {
// We're using OS theme, check if we need to change // We're using OS theme, check if we need to change
if (os !== localStorage[key+'_default']) { if (os !== localStorage[key+'_default']) {

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

@ -33,9 +33,11 @@ define([
} }
} }
document.getElementById('sbox-iframe').setAttribute('src',
var $i = $('<iframe>').attr('id', 'sbox-iframe').attr('src',
ApiConfig.httpSafeOrigin + (pathname || window.location.pathname) + 'inner.html?' + ApiConfig.httpSafeOrigin + (pathname || window.location.pathname) + 'inner.html?' +
requireConfig.urlArgs + '#' + encodeURIComponent(JSON.stringify(req))); requireConfig.urlArgs + '#' + encodeURIComponent(JSON.stringify(req)));
$('iframe-placeholder').after($i).remove();
// This is a cheap trick to avoid loading sframe-channel in parallel with the // This is a cheap trick to avoid loading sframe-channel in parallel with the
// loading screen setup. // loading screen setup.

4
www/contacts/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

4
www/debug/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.3" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

24
www/debug/main.js
Unescape Escape View File

@ -30,30 +30,6 @@ define([
$(waitFor()); $(waitFor());
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
SFCommonO.initIframe(waitFor); SFCommonO.initIframe(waitFor);
}).nThen(function (waitFor) {
var req = {
cfg: requireConfig,
req: [ '/common/loading.js' ],
pfx: window.location.origin
};
window.rc = requireConfig;
window.apiconf = ApiConfig;
$('#sbox-iframe').attr('src',
ApiConfig.httpSafeOrigin + '/debug/inner.html?' + requireConfig.urlArgs +
'#' + encodeURIComponent(JSON.stringify(req)));
// This is a cheap trick to avoid loading sframe-channel in parallel with the
// loading screen setup.
var done = waitFor();
var onMsg = function (msg) {
var data = JSON.parse(msg.data);
if (data.q !== 'READY') { return; }
window.removeEventListener('message', onMsg);
var _done = done;
done = function () { };
_done();
};
window.addEventListener('message', onMsg);
}).nThen(function (/*waitFor*/) { }).nThen(function (/*waitFor*/) {
var hash = localStorage[Constants.userHashKey] || localStorage[Constants.fileHashKey]; var hash = localStorage[Constants.userHashKey] || localStorage[Constants.fileHashKey];
var drive = hash && ('#'+hash === window.location.hash); var drive = hash && ('#'+hash === window.location.hash);

4
www/drive/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

4
www/file/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

4
www/kanban/index.html
Unescape Escape View File

@ -7,11 +7,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>
</iframe> </iframe>
</body> </body>
</html> </html>

4
www/notifications/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

4
www/oodoc/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="/common/onlyoffice/main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="/common/onlyoffice/main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

4
www/ooslide/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="/common/onlyoffice/main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="/common/onlyoffice/main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

4
www/pad/index.html
Unescape Escape View File

@ -6,8 +6,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

4
www/poll/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

4
www/profile/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

4
www/settings/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

4
www/sheet/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="/common/onlyoffice/main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="/common/onlyoffice/main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

4
www/slide/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

4
www/support/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

4
www/teams/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

4
www/todo/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

4
www/whiteboard/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script> <script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.2" rel="stylesheet" type="text/css"> <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

2
www/worker/index.html
Unescape Escape View File

@ -35,4 +35,4 @@
</style> </style>
</head> </head>
<body> <body>
<iframe id="sbox-iframe"> <iframe-placeholder>

Write Preview
Loading…
Cancel
Save