Merge branch 'staging' into lightbox

2020-03-31 10:21:54 +02:00
parent 938e5c5cb1 eddbe80eef
commit b27eb956df
7 changed files with 635 additions and 120 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();