Use safe navigation operator for Bootstrap Modals

There are too many edge cases where the modal might not be present any longer, and we just want to avoid unnecessary errors.
openHPI · Oct 15, 2024 · 1aebf25 · 1aebf25
1 parent 684e862
commit 1aebf25
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/app/assets/javascripts/editor/editor.js.erb b/app/assets/javascripts/editor/editor.js.erb
@@ -501,7 +501,7 @@ var CodeOceanEditor = {
 
         $('#askForCommentsButton').one('click', this.requestComments.bind(this));
         $('#closeAskForCommentsButton').on('click', function () {
-            bootstrap.Modal.getInstance($('#comment-modal')).hide();
+            bootstrap.Modal.getInstance($('#comment-modal'))?.hide();
         });
 
         setTimeout(function () {

diff --git a/app/assets/javascripts/editor/participantsupport.js.erb b/app/assets/javascripts/editor/participantsupport.js.erb
@@ -140,7 +140,7 @@ CodeOceanEditorRequestForComments = {
         }
       }).catch(this.ajaxError.bind(this));
 
-      bootstrap.Modal.getInstance(commentModal).hide();
+      bootstrap.Modal.getInstance(commentModal)?.hide();
       this.hideSpinner();
       questionElement.prop("disabled", false).val('');
       closeAskForCommentsButton.removeClass('d-none');

diff --git a/app/assets/javascripts/exercise_collections.js b/app/assets/javascripts/exercise_collections.js
@@ -187,7 +187,7 @@ $(document).on('turbolinks:load', function() {
         for (var i = 0; i < selectedExercises.length; i++) {
           addExercise(selectedExercises[i].value, selectedExercises[i].label);
         }
-        bootstrap.Modal.getInstance($('#add-exercise-modal')).hide();
+        bootstrap.Modal.getInstance($('#add-exercise-modal'))?.hide();
         updateExerciseList();
         addExercisesForm.find('select').val('').trigger("chosen:updated");
       });

diff --git a/app/assets/javascripts/exercises.js b/app/assets/javascripts/exercises.js
@@ -254,7 +254,7 @@ $(document).on('turbolinks:load', function () {
             for (let i = 0; i < selectedTips.length; i++) {
                 addTip(selectedTips[i].value, selectedTips[i].label);
             }
-            bootstrap.Modal.getInstance($('#add-tips-modal')).hide();
+            bootstrap.Modal.getInstance($('#add-tips-modal'))?.hide();
             updateTipsJSON();
             chosenInputTips.val('').trigger("chosen:updated");
         });
@@ -395,7 +395,7 @@ $(document).on('turbolinks:load', function () {
                 if (response.status === 'success') {
                     $messageDiv.addClass('export-success');
                     setTimeout((function () {
-                        bootstrap.Modal.getInstance($('#export-modal')).hide();
+                        bootstrap.Modal.getInstance($('#export-modal'))?.hide();
                         $messageDiv.html('').removeClass('export-success');
                     }), 3000);
                 } else {

diff --git a/app/assets/javascripts/request_for_comments.js b/app/assets/javascripts/request_for_comments.js
@@ -377,7 +377,7 @@ $(document).on('turbolinks:load', function () {
             if (commenttext !== "") {
                 createComment(fileid, row, editor, commenttext);
                 commentTextarea.val('');
-                bootstrap.Modal.getInstance(commentModal).hide();
+                bootstrap.Modal.getInstance(commentModal)?.hide();
             }
         });