From 6c1bfb6815a2e083265267c5f521b6a0d62e8a5f Mon Sep 17 00:00:00 2001 From: Sebastian Serth Date: Tue, 28 Feb 2023 11:35:17 +0100 Subject: [PATCH] Fix showSpinner for reset action --- app/assets/javascripts/editor/editor.js.erb | 10 ++++++---- app/assets/javascripts/editor/submissions.js | 4 ++-- app/views/exercises/_editor.html.slim | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/editor/editor.js.erb b/app/assets/javascripts/editor/editor.js.erb index 88b6969e..176596e0 100644 --- a/app/assets/javascripts/editor/editor.js.erb +++ b/app/assets/javascripts/editor/editor.js.erb @@ -56,17 +56,19 @@ var CodeOceanEditor = { confirmReset: function (event) { event.preventDefault(); - if (confirm($('#start-over').data('message-confirm'))) { - this.resetCode(); + const initiator = $(event.target.closest("button")); + if (confirm(initiator.data('message-confirm'))) { + this.resetCode(initiator); } }, confirmResetActiveFile: function (event) { event.preventDefault(); - let message = $('#start-over-active-file').data('message-confirm'); + const initiator = $(event.target.closest("button")); + let message = initiator.data('message-confirm'); message = message.replace('%{filename}', CodeOceanEditor.active_file.filename.replace(/#$/, '')) if (confirm(message)) { - this.resetCode(true); // delete only active file + this.resetCode(initiator, true); // delete only active file } }, diff --git a/app/assets/javascripts/editor/submissions.js b/app/assets/javascripts/editor/submissions.js index 8e143923..9afa4b27 100644 --- a/app/assets/javascripts/editor/submissions.js +++ b/app/assets/javascripts/editor/submissions.js @@ -111,8 +111,8 @@ CodeOceanEditorSubmissions = { }); }, - resetCode: function(onlyActiveFile = false) { - this.showSpinner(this); + resetCode: function(initiator, onlyActiveFile = false) { + this.showSpinner(initiator); this.ajax({ method: 'GET', url: $('#start-over').data('url') || $('#start-over-active-file').data('url') diff --git a/app/views/exercises/_editor.html.slim b/app/views/exercises/_editor.html.slim index 1bb691ba..39e46c0e 100644 --- a/app/views/exercises/_editor.html.slim +++ b/app/views/exercises/_editor.html.slim @@ -47,6 +47,7 @@ = " | " button#start-over-active-file.p-0.border-0.btn-link.bg-white.text-primary data-message-confirm=t('exercises.editor.confirm_start_over_active_file') data-url=reload_exercise_path(@exercise) + i.fa-solid.fa-circle-notch.fa-spin.d-none i.fa-solid.fa-clock-rotate-left = t('exercises.editor.start_over_active_file')