From d62f2c6a40213b740546a563caac41da63af272b Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Tue, 31 Oct 2023 13:15:58 +0100 Subject: [PATCH] Merge pull request #15509 from overleaf/jpa-ide-react-pug-tweaks [web] editor: use CSS/JavaScript loading primitives from base template GitOrigin-RevId: fb570f62e37517f2a4444d469435e854fd890db6 --- services/web/app/views/project/editor.pug | 9 +++------ services/web/app/views/project/ide-react.pug | 4 ---- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/services/web/app/views/project/editor.pug b/services/web/app/views/project/editor.pug index 8add4473f9..d4f49be53e 100644 --- a/services/web/app/views/project/editor.pug +++ b/services/web/app/views/project/editor.pug @@ -7,9 +7,8 @@ block vars - var suppressCookieBanner = true - metadata.robotsNoindexNofollow = true -block css - each file in entrypointStyles('ide') - link(rel='stylesheet', href=file) +block entrypointVar + - entrypoint = 'ide' block content .editor(ng-controller="IdeController").full-size @@ -119,9 +118,7 @@ block content block append meta include ./editor/meta -block foot-scripts +block prepend foot-scripts each file in (useOpenTelemetry ? entrypointScripts("tracing") : []) script(type="text/javascript", nonce=scriptNonce, src=file) script(type="text/javascript", nonce=scriptNonce, src=(wsUrl || '/socket.io') + '/socket.io.js') - each file in entrypointScripts("ide") - script(type="text/javascript", nonce=scriptNonce, src=file) diff --git a/services/web/app/views/project/ide-react.pug b/services/web/app/views/project/ide-react.pug index 283629f294..3d7b5213e6 100644 --- a/services/web/app/views/project/ide-react.pug +++ b/services/web/app/views/project/ide-react.pug @@ -9,10 +9,6 @@ block vars block entrypointVar - entrypoint = 'pages/ide' -block css - each file in entrypointStyles('ide') - link(rel='stylesheet', href=file) - block content main#ide-root .loading-screen