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

2016-08-25 17:59:37 +02:00
parent e386749e89 f40b798d88
commit f47a6f1cbb
3 changed files with 25 additions and 3 deletions
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -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 = '';