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

Replace the Netflux old client (netflux.js) by the Netflux2 client.

Browse Source 
Move the WebRTC peer-to-peer use case in /padrtc, which still uses the old
Netflux client
Use es6-promises.min.js to solve a issue with some browser and the new
Netflux client
This commit is contained in:
Yann Flory
2016-04-07 18:48:01 +02:00
parent cf9f60bd57
commit 0b3d6e15b8
14 changed files with 2628 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
www/common/netflux.js
View File

@@ -1342,6 +1342,7 @@ return /******/ (function(modules) { // webpackBootstrap
if (msg[0] !== 0 && msg[1] !== 'ACK') {
return;
}
if (msg[2] === 'IDENT' && msg[1] === '') {
socket.uid = msg[3];
webChannel.myID = msg[3];
@@ -1401,7 +1402,7 @@ return /******/ (function(modules) { // webpackBootstrap
// Trigger onJoining() when another user is joining the channel
// Register the user in the list of peers in the channel
if (webChannel.peers.length === 0 && msg[1].length === 16) {
// We've just catched the history keeper
// We've just catched the history keeper (16 characters length name)
history_keeper = msg[1];
webChannel.hc = history_keeper;
}