From b2bf1db36f3a9e418330ae9e988779f3d2eb637b Mon Sep 17 00:00:00 2001
From: Joe <33972521+hnb-ku@users.noreply.github.com>
Date: Mon, 20 Jun 2022 16:39:11 +0800
Subject: [PATCH] DEV: Move preloaded `json` into `<discourse-assets>` element
(#17145)
This PR introduces 0 visual or functional changes. The only thing that it changes is that it moves the data-preloaded div (which has the app boot json into the <discourse-assets> element.
See #17078 for a bit more context.
The reason behind this change is that it makes devTools element view a little bit less cluttered.
---
app/assets/javascripts/discourse/app/index.html | 4 +++-
app/views/layouts/application.html.erb | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/assets/javascripts/discourse/app/index.html b/app/assets/javascripts/discourse/app/index.html
index 4a5295d14ea..96b9f9baee4 100644
--- a/app/assets/javascripts/discourse/app/index.html
+++ b/app/assets/javascripts/discourse/app/index.html
@@ -25,6 +25,9 @@
<bootstrap-content key="discourse-stylesheets">
{{content-for "discourse-stylesheets"}}
</discourse-assets-stylesheets>
+ <discourse-assets-json>
+ <bootstrap-content key="preloaded">
+ </discourse-assets-json>
</discourse-assets>
<bootstrap-content key="body">
@@ -34,7 +37,6 @@
</section>
<bootstrap-content key="hidden-login-form">
- <bootstrap-content key="preloaded">
<script defer src="{{rootURL}}assets/start-discourse.js"></script>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 3c6f20cbad4..52c5302136a 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -75,6 +75,9 @@
<discourse-assets-stylesheets>
<%= render partial: "common/discourse_stylesheet" %>
</discourse-assets-stylesheets>
+ <discourse-assets-json>
+ <div class="hidden" id="data-preloaded" data-preloaded="<%= preloaded_json %>"></div>
+ </discourse-assets-json>
</discourse-assets>
<%- if allow_plugins? %>
@@ -114,7 +117,6 @@
</form>
<% end %>
- <div class="hidden" id="data-preloaded" data-preloaded="<%= preloaded_json %>"></div>
<script defer src="<%= script_asset_path "start-discourse" %>"></script>