Merge branch 'master' of github.com:xwiki-labs/cryptpad

This commit is contained in:
ansuz committed 2016-08-25 17:59:37 +02:00
commit f47a6f1cbb
3 files changed
+25 -3

No files matched your search

+3 -2
View File
@@ -224,10 +224,11 @@ define([
return {
failed: function () {
connected = false;
userListElement.textContent = '';
userListElement.textContent = 'Disconnected';
lagElement.textContent = '';
},
reconnecting: function () {
reconnecting: function (userId) {
myUserName = userId;
connected = false;
userListElement.textContent = Messages.reconnecting;
lagElement.textContent = '';