Merge branch 'staging' into cba

2020-04-17 15:17:24 +02:00
parent f03713e60a 4e57e390da
commit dd814713dd
33 changed files with 702 additions and 807 deletions
--- a/www/code/inner.js
+++ b/www/code/inner.js
@@ -281,6 +281,7 @@ define([
            if (MEDIA_TAG_MODES.indexOf(mode) !== -1) {
                // Embedding is endabled
                framework.setMediaTagEmbedder(function (mt) {
+                    editor.focus();
                    editor.replaceSelection($(mt)[0].outerHTML);
                });
            } else {