From 55bdcf7664e981b39ba336f2163a9bbe489caf99 Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Wed, 1 Feb 2023 17:31:24 +0100 Subject: [PATCH] Merge pull request #11583 from overleaf/msm-ace-ce [web] Force ACE when `modules/source-editor` not available GitOrigin-RevId: 2b43a048e882d99aa52ee8ead6c67152d4080eb2 --- services/web/app/views/project/editor/meta.pug | 1 + services/web/frontend/js/ide/editor/EditorManager.js | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/services/web/app/views/project/editor/meta.pug b/services/web/app/views/project/editor/meta.pug index de64035241..03f51778a5 100644 --- a/services/web/app/views/project/editor/meta.pug +++ b/services/web/app/views/project/editor/meta.pug @@ -23,6 +23,7 @@ meta(name="ol-wsRetryHandshake" data-type="json" content=settings.wsRetryHandsha meta(name="ol-pdfjsVariant" content=pdfjsVariant) meta(name="ol-debugPdfDetach" data-type="boolean" content=debugPdfDetach) meta(name="ol-showLegacySourceEditor", data-type="boolean" content=showLegacySourceEditor) +meta(name="ol-hasNewSourceEditor", data-type="boolean" content=moduleIncludesAvailable('editor:source-editor')) meta(name="ol-showSymbolPalette" data-type="boolean" content=showSymbolPalette) meta(name="ol-galileoEnabled" data-type="string" content=galileoEnabled) meta(name="ol-galileoPromptWords" data-type="string" content=galileoPromptWords) diff --git a/services/web/frontend/js/ide/editor/EditorManager.js b/services/web/frontend/js/ide/editor/EditorManager.js index 42810310d5..a6a1b333fb 100644 --- a/services/web/frontend/js/ide/editor/EditorManager.js +++ b/services/web/frontend/js/ide/editor/EditorManager.js @@ -195,6 +195,11 @@ export default EditorManager = (function () { } newSourceEditor() { + // the new source editor is not available at the moment in CE + if (!getMeta('ol-hasNewSourceEditor')) { + return false + } + // Use the new source editor if the legacy editor is disabled if (!getMeta('ol-showLegacySourceEditor')) { return true