Don't include all html builders on client and server side

This commit is contained in:
Robin Ward 2017-08-07 11:28:56 -04:00
parent 4c306f9f49
commit 2e4b3e9b06
2 changed files with 6 additions and 3 deletions

View File

@ -448,7 +448,9 @@ class ApplicationController < ActionController::Base
end end
DiscoursePluginRegistry.html_builders.each do |name, blk| DiscoursePluginRegistry.html_builders.each do |name, blk|
data[name] = blk.call(self) if name.start_with?("client:")
data[name.sub(/^client:/, '')] = blk.call(self)
end
end end
MultiJson.dump(data) MultiJson.dump(data)

View File

@ -55,7 +55,7 @@
<%= yield :head %> <%= yield :head %>
<%= raw build_plugin_html 'before-head-close' %> <%= raw build_plugin_html 'server:before-head-close' %>
</head> </head>
<body class="<%= body_classes %>"> <body class="<%= body_classes %>">
@ -87,6 +87,7 @@
<%- unless customization_disabled? || loading_admin? %> <%- unless customization_disabled? || loading_admin? %>
<%= theme_lookup("header") %> <%= theme_lookup("header") %>
<%= raw build_plugin_html 'server:header' %>
<%- end %> <%- end %>
<section id='main'> <section id='main'>
@ -124,6 +125,6 @@
<%- unless customization_disabled? %> <%- unless customization_disabled? %>
<%= raw theme_lookup("body_tag") %> <%= raw theme_lookup("body_tag") %>
<%- end %> <%- end %>
<%= raw build_plugin_html 'before-body-close' %> <%= raw build_plugin_html 'server:before-body-close' %>
</body> </body>
</html> </html>