Extract method to create memento related event

macao/assets/custom.js

@@ -11,20 +11,7 @@ $(document).ready(function() {
     // $('.commentaireInfo').prop('popover', 'auto');
     $('.commentaireInfoGroup').show();
 
-    // Comment popover
-    $('[spanid]').addClass('comment-trigger').each(function (){
-        const spanid = $(this).attr('spanid');
 
-        if($("[commentaireid=" + spanid + "]").length !== 0) {
-            $(this).popover({
-                trigger: 'click',
-                html: true,
-                placement: 'auto',
-                content: $("[commentaireid=" + spanid + "]")
-            });
-            $("[commentaireid=" + spanid + "]").toggle()
-        }
-    });
 
     // $(document).on('click', function() {
     //     $('[spanid]').popover('hide');
@@ -46,3 +33,25 @@ $(document).ready(function() {
         $('.book-icon').hide();
     }
 });
+
+// Memento popover
+// This function adds a popover to elements with the attribute spanid
+// that have a corresponding commentaireid element.
+const addMementoEvent = function(){
+    $('[spanid]:not(.comment-trigger)').addClass('comment-trigger').each(function (){
+        const spanid = $(this).attr('spanid');
+
+        if($("[commentaireid=" + spanid + "]").length !== 0) {
+            $(this).popover({
+                trigger: 'click',
+                html: true,
+                placement: 'auto',
+                content: $("[commentaireid=" + spanid + "]")
+            });
+            $("[commentaireid=" + spanid + "]").toggle()
+        }
+    });
+}
+
+// Add addMementoEvent to the global scope
+window.addMementoEvent = addMementoEvent;

macao/assets/quiz.js

@@ -17,6 +17,8 @@ function checkAllQuestions(questions, surveyConfig, converter) {
         surveyConfig.incorrectComment = surveyConfig.incorrectComment.replace(/\n\n/g, "<br>");
         correctIndic.commentNode.innerHTML = converter.renderInline(surveyConfig.incorrectComment) || "Some answers are incorrect!";
     }
+
+    window.addMementoEvent();
 }
 
 /**
@@ -152,6 +154,11 @@ $(function () {
         }
     });
 
+    survey.onAfterRenderSurvey.add((survey, options) => {
+        window.addMementoEvent();
+    });
+
+
     // Add "Check answers" button
     survey.addNavigationItem({
         id: "sv-nav-check",