htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix showSpinner for reset action

Browse Source
This commit is contained in:
Sebastian Serth
2023-02-28 11:35:17 +01:00
parent 65d67cdeec
commit 6c1bfb6815
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/editor/editor.js.erb
View File

@ -56,17 +56,19 @@ var CodeOceanEditor = {
confirmReset: function (event) { confirmReset: function (event) {
event.preventDefault(); event.preventDefault();
if (confirm($('#start-over').data('message-confirm'))) { const initiator = $(event.target.closest("button"));
this.resetCode(); if (confirm(initiator.data('message-confirm'))) {
this.resetCode(initiator);
} }
}, },
confirmResetActiveFile: function (event) { confirmResetActiveFile: function (event) {
event.preventDefault(); 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(/#$/, '')) message = message.replace('%{filename}', CodeOceanEditor.active_file.filename.replace(/#$/, ''))
if (confirm(message)) { if (confirm(message)) {
this.resetCode(true); // delete only active file this.resetCode(initiator, true); // delete only active file
} }
}, },

4
app/assets/javascripts/editor/submissions.js
View File

@ -111,8 +111,8 @@ CodeOceanEditorSubmissions = {
}); });
}, },
resetCode: function(onlyActiveFile = false) { resetCode: function(initiator, onlyActiveFile = false) {
this.showSpinner(this); this.showSpinner(initiator);
this.ajax({ this.ajax({
method: 'GET', method: 'GET',
url: $('#start-over').data('url') || $('#start-over-active-file').data('url') url: $('#start-over').data('url') || $('#start-over-active-file').data('url')

1
app/views/exercises/_editor.html.slim
View File

@ -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) 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 i.fa-solid.fa-clock-rotate-left
= t('exercises.editor.start_over_active_file') = t('exercises.editor.start_over_active_file')