From fdb289164fd4b2984687091cb69b78d4ea4eda6f Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 21 Jun 2022 14:26:52 +0100 Subject: [PATCH] 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 --- app/views/users/password_reset.html.erb | 1 - app/views/users_email/show_confirm_new_email.html.erb | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/password_reset.html.erb b/app/views/users/password_reset.html.erb index 8a982ae95e2..43e09d7eaed 100644 --- a/app/views/users/password_reset.html.erb +++ b/app/views/users/password_reset.html.erb @@ -17,7 +17,6 @@ <%- content_for(:no_ember_head) do %> - <%= preload_script "ember_jquery" %> <%= render_google_universal_analytics_code %> <%- end %> diff --git a/app/views/users_email/show_confirm_new_email.html.erb b/app/views/users_email/show_confirm_new_email.html.erb index b820ba60391..59c1e9362d2 100644 --- a/app/views/users_email/show_confirm_new_email.html.erb +++ b/app/views/users_email/show_confirm_new_email.html.erb @@ -77,11 +77,12 @@ <%end%> <% end%> + <%= preload_script "vendor" %> <%= preload_script "locales/#{I18n.locale}" %> <%- if ExtraLocalesController.client_overrides_exist? %> <%= preload_script_url ExtraLocalesController.url('overrides') %> <%- end %> - <%= preload_script 'ember_jquery' %> + <% # TODO: move all this logic into the ember app %> <%= preload_script "discourse/app/lib/webauthn" %> <%= preload_script "confirm-new-email/confirm-new-email" %> <%= preload_script "confirm-new-email/bootstrap" %>