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

Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2

Browse Source
This commit is contained in:
yflory
2017-08-17 15:44:41 +02:00
parent fc5bdd3bed a4850a7fcc
commit d88704fb50
6 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/metadata-manager.js
View File

@@ -82,7 +82,7 @@ define([], function () {
},
getMetadata: function () {
checkUpdate(false);
return metadataObj;
return Object.freeze(JSON.parse(JSON.stringify(metadataObj)));
},
getMetadataLazy: function () {
return metadataLazyObj;

3
www/common/sframe-noscriptfix.js
View File

@@ -1,3 +0,0 @@
// Fix for noscript bugs when caching iframe content.
// Caution, this file will get cached, you must change the name if you change it.
document.getElementById('sbox-iframe').setAttribute('src', 'http://localhost:3001/pad2/inner.html?cb=' + (+new Date()));

3
www/pad2/index.html
View File

@@ -27,5 +27,4 @@
</style>
</head>
<body>
<iframe id="sbox-iframe"></iframe><script src="/common/sframe-noscriptfix.js"></script>
<iframe id="sbox-iframe"></iframe>

5
www/pad2/outer.js
View File

@@ -1,17 +1,20 @@
define([
'/api/config',
'/common/sframe-channel.js',
'jquery',
'/common/sframe-chainpad-netflux-outer.js',
'/bower_components/nthen/index.js',
'/common/cryptpad-common.js',
'/bower_components/chainpad-crypto/crypto.js'
], function (SFrameChannel, $, CpNfOuter, nThen, Cryptpad, Crypto) {
], function (ApiConfig, SFrameChannel, $, CpNfOuter, nThen, Cryptpad, Crypto) {
console.log('xxx');
var sframeChan;
nThen(function (waitFor) {
$(waitFor());
}).nThen(function (waitFor) {
$('#sbox-iframe').attr('src',
ApiConfig.httpSafeOrigin + '/pad2/inner.html?' + ApiConfig.requireConf.urlArgs);
SFrameChannel.create($('#sbox-iframe')[0].contentWindow, waitFor(function (sfc) {
sframeChan = sfc;
console.log('sframe initialized');