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-22 18:19:06 +02:00
parent c33b128bf4 d9f5e3638e
commit 33025a9df9
10 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
www/pad2/outer.js
View File

@@ -4,14 +4,17 @@ define([
'/common/requireconfig.js',
'/common/cryptget.js'
], function (ApiConfig, $, RequireConfig, Cryptget) {
var requireConfig = RequireConfig();
$(function () {
var req = {
cfg: RequireConfig,
cfg: requireConfig,
req: [ '/common/loading.js' ],
pfx: window.location.origin
};
window.rc = requireConfig;
window.apiconf = ApiConfig;
$('#sbox-iframe').attr('src',
ApiConfig.httpSafeOrigin + '/pad2/inner.html?' + ApiConfig.requireConf.urlArgs +
ApiConfig.httpSafeOrigin + '/pad2/inner.html?' + requireConfig.urlArgs +
'#' + encodeURIComponent(JSON.stringify(req)));
});
require([
@@ -21,7 +24,6 @@ define([
'/common/cryptpad-common.js',
'/bower_components/chainpad-crypto/crypto.js'
], function (SFrameChannel, CpNfOuter, nThen, Cryptpad, Crypto) {
console.log('xxx');
var sframeChan;
var hashes;
var secret;