Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Remove leftover uses of ember_jquery (#17178) 

On the password_reset error screen, it was totally unused

On the show_confirm_new_email screen, we can load the `vendor` bundle instead. Eventually we should move all this logic into the Ember app
This commit is contained in:
David Taylor 2022-06-21 14:26:52 +01:00 committed by GitHub
parent def39b2d58
commit fdb289164f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/users/password_reset.html.erb
View File

@ -17,7 +17,6 @@
<%- content_for(:no_ember_head) do %> <%- content_for(:no_ember_head) do %>
<meta name="referrer" content="never"> <meta name="referrer" content="never">
<%= preload_script "ember_jquery" %>
<%= render_google_universal_analytics_code %> <%= render_google_universal_analytics_code %>
<%- end %> <%- end %>

3
app/views/users_email/show_confirm_new_email.html.erb
View File

@ -77,11 +77,12 @@
<%end%> <%end%>
<% end%> <% end%>
<%= preload_script "vendor" %>
<%= preload_script "locales/#{I18n.locale}" %> <%= preload_script "locales/#{I18n.locale}" %>
<%- if ExtraLocalesController.client_overrides_exist? %> <%- if ExtraLocalesController.client_overrides_exist? %>
<%= preload_script_url ExtraLocalesController.url('overrides') %> <%= preload_script_url ExtraLocalesController.url('overrides') %>
<%- end %> <%- end %>
<%= preload_script 'ember_jquery' %> <% # TODO: move all this logic into the ember app %>
<%= preload_script "discourse/app/lib/webauthn" %> <%= preload_script "discourse/app/lib/webauthn" %>
<%= preload_script "confirm-new-email/confirm-new-email" %> <%= preload_script "confirm-new-email/confirm-new-email" %>
<%= preload_script "confirm-new-email/bootstrap" %> <%= preload_script "confirm-new-email/bootstrap" %>