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

Check for intervention modal visibility before displaying it

Browse Source
This commit is contained in:
Sebastian Serth
2023-02-28 01:13:10 +01:00
parent 1e41a7f7ab
commit 65d67cdeec
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -878,6 +878,11 @@ var CodeOceanEditor = {
// timeUntilIntervention passed // timeUntilIntervention passed
if (editor.data('tips-interventions')) { if (editor.data('tips-interventions')) {
const modal = $('#tips-intervention-modal'); const modal = $('#tips-intervention-modal');
if (!modal.isPresent()) {
// The modal is not present (e.g., because the site was navigated), so we don't continue here.
return;
}
modal.find('.modal-footer').html(I18n.t("exercises.implement.intervention.explanation", {duration: Math.round(percentile75 / 60)})); modal.find('.modal-footer').html(I18n.t("exercises.implement.intervention.explanation", {duration: Math.round(percentile75 / 60)}));
new bootstrap.Modal(modal).show(); new bootstrap.Modal(modal).show();
$.ajax({ $.ajax({
@ -890,6 +895,11 @@ var CodeOceanEditor = {
}); });
} else if (editor.data('break-interventions')) { } else if (editor.data('break-interventions')) {
const modal = $('#break-intervention-modal'); const modal = $('#break-intervention-modal');
if (!modal.isPresent()) {
// The modal is not present (e.g., because the site was navigated), so we don't continue here.
return;
}
modal.find('.modal-footer').html(I18n.t("exercises.implement.intervention.explanation", {duration: Math.round(percentile75 / 60)})); modal.find('.modal-footer').html(I18n.t("exercises.implement.intervention.explanation", {duration: Math.round(percentile75 / 60)}));
new bootstrap.Modal(modal).show(); new bootstrap.Modal(modal).show();
$.ajax({ $.ajax({
@ -905,7 +915,12 @@ var CodeOceanEditor = {
// only show intervention if user did not requested for a comment already // only show intervention if user did not requested for a comment already
if (!button.prop('disabled')) { if (!button.prop('disabled')) {
$('#rfc_intervention_text').show(); $('#rfc_intervention_text').show();
modal = $('#comment-modal'); const modal = $('#comment-modal');
if (!modal.isPresent()) {
// The modal is not present (e.g., because the site was navigated), so we don't continue here.
return;
}
modal.find('.modal-footer').html(I18n.t("exercises.implement.intervention.explanation", {duration: Math.round(percentile75 / 60)})); modal.find('.modal-footer').html(I18n.t("exercises.implement.intervention.explanation", {duration: Math.round(percentile75 / 60)}));
modal.on('hidden.bs.modal', function () { modal.on('hidden.bs.modal', function () {
modal.find('.modal-footer').text(''); modal.find('.modal-footer').text('');