dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change logo

This commit is contained in:
Caleb James DeLisle 2014-11-06 12:56:57 +01:00
parent 619c01cb7f
commit 9325100a02
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
cryptofist.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 249 KiB

After

Width:  |  Height:  |  Size: 303 KiB

10
www/realtime-wysiwyg.js
View File

@ -451,6 +451,11 @@ window.ErrorBox = ErrorBox;
var onEvent = function () { };
var toolbar = createRealtimeToolbar('#cke_1_toolbox');
var userListElement = createUserList(toolbar.find('.rtwysiwyg-toolbar-leftside'));
var spinner = createSpinner(toolbar.find('.rtwysiwyg-toolbar-rightside'));
var lagElement = createLagElement(toolbar.find('.rtwysiwyg-toolbar-rightside'));
var userList
var allMessages = [];
var isErrorState = false;
@ -488,6 +493,7 @@ console.log(new Error().stack);
socket.onOpen.push(function (evt) {
if (!initializing) {
socket.realtime.start();
updateUserList(userName, userListElement, userList);
return;
}
@ -500,10 +506,6 @@ console.log(new Error().stack);
//createDebugLink(realtime, doc, allMessages, toolbar);
var userListElement = createUserList(toolbar.find('.rtwysiwyg-toolbar-leftside'));
var spinner = createSpinner(toolbar.find('.rtwysiwyg-toolbar-rightside'));
var lagElement = createLagElement(toolbar.find('.rtwysiwyg-toolbar-rightside'));
setInterval(function () {
if (initializing || isSocketDisconnected(socket, realtime)) { return; }
checkLag(realtime, lagElement);