web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into soon

Browse Source
This commit is contained in:
ansuz 2020-03-30 18:30:27 -04:00
commit 1a825ad664
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/pad/inner.js
View File

@ -601,6 +601,8 @@ define([
restoreMediaTags(userDocStateDom, mediaTagMap); restoreMediaTags(userDocStateDom, mediaTagMap);
cursors.removeCursors(inner);
// Deal with adjasent text nodes // Deal with adjasent text nodes
userDocStateDom.normalize(); userDocStateDom.normalize();
inner.normalize(); inner.normalize();
@ -809,8 +811,8 @@ define([
}); });
/* Display the cursor of other users and send our cursor */ /* Display the cursor of other users and send our cursor */
//framework.setCursorGetter(cursors.cursorGetter); framework.setCursorGetter(cursors.cursorGetter);
//framework.onCursorUpdate(cursors.onCursorUpdate); framework.onCursorUpdate(cursors.onCursorUpdate);
inner.addEventListener('click', updateCursor); inner.addEventListener('click', updateCursor);
inner.addEventListener('keyup', updateCursor); inner.addEventListener('keyup', updateCursor);