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

14
www/common/toolbar.js
View File

@@ -132,7 +132,7 @@ define([
userList.forEach(function(user) {
if(user !== myUserName) {
var data = (userData) ? (userData[user] || null) : null;
var userName = (data) ? data.name : null;
var userName = (data) ? data.name : user;
if(userName) {
if(i === 0) list = ' : ';
list += userName + ', ';
@@ -170,9 +170,9 @@ define([
return $container.find('#'+id)[0];
};
var checkLag = function (webChannel, lagElement) {
if(typeof webChannel.getLag !== "function") { return; }
var lag = webChannel.getLag();
var checkLag = function (getLag, lagElement) {
if(typeof getLag !== "function") { return; }
var lag = getLag();
var lagMsg = Messages.lag + ' ';
if(lag) {
var lagSec = lag/1000;
@@ -214,7 +214,7 @@ define([
localStorage['CryptPad_RECENTPADS'] = JSON.stringify(out);
};
var create = function ($container, myUserName, realtime, webChannel, userList, config) {
var create = function ($container, myUserName, realtime, getLag, userList, config) {
var toolbar = createRealtimeToolbar($container);
createEscape(toolbar.find('.rtwysiwyg-toolbar-leftside'));
var userListElement = createUserList(toolbar.find('.rtwysiwyg-toolbar-leftside'));
@@ -223,7 +223,7 @@ define([
var userData = config.userData;
var changeNameID = config.changeNameID;
// Check if the suer is allowed to change his name
// Check if the user is allowed to change his name
if(changeNameID) {
// Create the button and update the element containing the user list
userListElement = createChangeName($container, userListElement, changeNameID);
@@ -253,7 +253,7 @@ define([
setInterval(function () {
if (!connected) { return; }
checkLag(webChannel, lagElement);
checkLag(getLag, lagElement);
}, 3000);
return {