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

Merge branch 'netflux' into beta

Browse Source
This commit is contained in:
ansuz 2016-04-20 15:25:00 +02:00
commit a3787ee4dc
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/common/realtime-input.js
View File

@ -197,7 +197,7 @@ define([
return ChainPad.create(userName, return ChainPad.create(userName,
passwd, passwd,
channel, channel,
config.initialState || {}, config.initialState || '',
{ {
transformFunction: config.transformFunction transformFunction: config.transformFunction
}); });
@ -206,7 +206,7 @@ define([
var onOpen = function(wc, network) { var onOpen = function(wc, network) {
channel = wc.id; channel = wc.id;
window.location.hash = channel + '|' + chanKey; window.location.hash = channel + chanKey;
// Add the existing peers in the userList // Add the existing peers in the userList
wc.members.forEach(onJoining); wc.members.forEach(onJoining);
@ -267,7 +267,8 @@ define([
toReturn.patchText = TextPatcher.create({ toReturn.patchText = TextPatcher.create({
realtime: realtime realtime: realtime,
logging: true
}); });
realtime.start(); realtime.start();

2
www/pad/main.js
View File

@ -80,7 +80,7 @@ define([
else { else {
var hash = window.location.hash.substring(1); var hash = window.location.hash.substring(1);
channel = hash.substr(0,32); channel = hash.substr(0,32);
key = hash.substr(33); key = hash.substr(32);
} }
var fixThings = false; var fixThings = false;