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

oops changed some work in the js file 

Revert "change logo"

This reverts commit 9325100a02.
This commit is contained in:
Caleb James DeLisle 2014-11-06 13:03:20 +01:00
parent 470eee56b9
commit 652a1da7a4
2 changed files with 4 additions and 6 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: 303 KiB

After

Width:  |  Height:  |  Size: 249 KiB

10
www/realtime-wysiwyg.js
View File

@ -451,11 +451,6 @@ 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;
@ -493,7 +488,6 @@ console.log(new Error().stack);
socket.onOpen.push(function (evt) {
if (!initializing) {
socket.realtime.start();
updateUserList(userName, userListElement, userList);
return;
}
@ -506,6 +500,10 @@ 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);