Fix fast reconnect, and add support for reconnecting ws in polls

2017-03-15 16:01:00 +01:00
parent 66ff6ae1b0
commit a286599f93
5 changed files with 49 additions and 30 deletions
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -8,7 +8,7 @@ define([
    '/bower_components/chainpad-json-validator/json-ot.js',
    '/common/TypingTests.js',
    'json.sortify',
-    '/bower_components/textpatcher/TextPatcher.amd.js',
+    '/bower_components/textpatcher/TextPatcher.js',
    '/common/cryptpad-common.js',
    '/common/visible.js',
    '/common/notify.js',
@@ -656,10 +656,12 @@ define([
                    }
                }

-                module.patchText = TextPatcher.create({
-                    realtime: info.realtime,
-                    //logging: true,
-                });
+                if (module.realtime !== info.realtime) {
+                    module.patchText = TextPatcher.create({
+                        realtime: info.realtime,
+                        //logging: true,
+                    });
+                }

                module.users = info.userList.users;
                module.realtime = info.realtime;