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

Fix worker app

Browse Source
This commit is contained in:
yflory 2018-01-29 15:17:20 +01:00
parent b6e91c772e
commit 1c39e8b1bb
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/worker/inner.js
View File

@ -32,6 +32,7 @@ define([
sFrameChan.onReady(waitFor()); sFrameChan.onReady(waitFor());
}).nThen(function (/*waitFor*/) { }).nThen(function (/*waitFor*/) {
var $container = $('#cp-app-worker-container'); var $container = $('#cp-app-worker-container');
$('<a>', {href:'http://localhost:3000/worker/', target:'_blank'}).text('other').appendTo($container);
var $bar = $('.cp-toolbar-container'); var $bar = $('.cp-toolbar-container');
var displayed = ['useradmin', 'newpad', 'limit', 'pageTitle']; var displayed = ['useradmin', 'newpad', 'limit', 'pageTitle'];

16
www/worker/worker.js
View File

@ -29,16 +29,17 @@ require.config({
}); });
var i = 0; var i = 0;
var id = Math.floor(Math.random()*100000);
onconnect = function(e) { onconnect = function(e) {
console.log(e); console.log(e);
console.log(i); console.log(i);
var port = e.ports[0]; var port = e.ports[0];
console.log('here'); console.log('here');
require([ //require([
'/common/outer/async-store.js' // '/common/outer/async-store.js'
], function (Store) { //], function (Store) {
console.log(Store); //console.log(Store);
console.log(self.Proxy); console.log(self.Proxy);
var n = i; var n = i;
port.postMessage({state: 'READY'}); port.postMessage({state: 'READY'});
@ -46,8 +47,9 @@ onconnect = function(e) {
console.log('worker received'); console.log('worker received');
console.log(e.data); console.log(e.data);
port.postMessage('hello CryptPad'+n); port.postMessage('hello CryptPad'+n);
port.postMessage('This is '+id);
}; };
var data = { /*var data = {
query: function (cmd, data, cb) { query: function (cmd, data, cb) {
console.log(cmd, data); console.log(cmd, data);
}, },
@ -64,7 +66,7 @@ onconnect = function(e) {
}); });
port.postMessage('Store is connected!'); port.postMessage('Store is connected!');
port.postMessage('Your username is ' + ret.store.proxy['cryptpad.username']); port.postMessage('Your username is ' + ret.store.proxy['cryptpad.username']);
}); });*/
i++; i++;
}); //});
}; };