Merge branch 'soon' into staging

2020-03-30 18:30:34 -04:00
parent b588e8ed43 1a825ad664
commit eddbe80eef
6 changed files with 288 additions and 16 deletions
--- a/www/pad/inner.js
+++ b/www/pad/inner.js
@@ -601,6 +601,8 @@ define([

            restoreMediaTags(userDocStateDom, mediaTagMap);

+            cursors.removeCursors(inner);
+
            // Deal with adjasent text nodes
            userDocStateDom.normalize();
            inner.normalize();
@@ -809,8 +811,8 @@ define([
        });

        /* Display the cursor of other users and send our cursor */
-        //framework.setCursorGetter(cursors.cursorGetter);
-        //framework.onCursorUpdate(cursors.onCursorUpdate);
+        framework.setCursorGetter(cursors.cursorGetter);
+        framework.onCursorUpdate(cursors.onCursorUpdate);
        inner.addEventListener('click', updateCursor);
        inner.addEventListener('keyup', updateCursor);