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

Fix 404 page inside iframe

Browse Source
This commit is contained in:
yflory 2018-01-23 15:53:00 +01:00
parent 30c6ab4717
commit 8628f2831e
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
customize.dist/four-oh-four.js
View File

@ -1,11 +1,12 @@
define([ define([
'jquery',
'/api/config', '/api/config',
'/common/hyperscript.js', '/common/hyperscript.js',
'/common/outer/local-store.js', '/common/outer/local-store.js',
'/customize/messages.js', '/customize/messages.js',
'less!/customize/src/less2/pages/page-404.less', 'less!/customize/src/less2/pages/page-404.less',
], function (Config, h, LocalStore, Messages) { ], function ($, Config, h, LocalStore, Messages) {
var urlArgs = Config.requireConf.urlArgs; var urlArgs = Config.requireConf.urlArgs;
var img = h('img#cp-logo', { var img = h('img#cp-logo', {
src: '/customize/cryptpad-new-logo-colors-logoonly.png?' + urlArgs src: '/customize/cryptpad-new-logo-colors-logoonly.png?' + urlArgs
@ -20,6 +21,14 @@ define([
href: loggedIn? '/drive/': '/', href: loggedIn? '/drive/': '/',
}, loggedIn? Messages.header_logoTitle: Messages.header_homeTitle); }, loggedIn? Messages.header_logoTitle: Messages.header_homeTitle);
if (Config.httpUnsafeOrigin && Config.httpUnsafeOrigin !== window.location.origin
&& window.parent) {
$(link).click(function (e) {
e.preventDefault();
window.parent.location = Config.httpUnsafeOrigin + $(link).attr('href').slice(1);
});
}
var content = h('div#cp-main', [ var content = h('div#cp-main', [
img, img,
brand, brand,