Skip to content

Commit

Permalink
Fixed #1177 - In gapfill feedback, images are not shown in lightbox w…
Browse files Browse the repository at this point in the history
…hen clicked

 - recommit this fix because it was inadvertently reverted
  • Loading branch information
torinfo committed Nov 30, 2022
1 parent b406b80 commit 621ea7c
Showing 1 changed file with 20 additions and 3 deletions.
Expand Up @@ -425,6 +425,7 @@

$("#feedbackTxt #txt").html(x_addLineBreaks(x_currentPageXML.getAttribute("feedback")));
$feedbackTxt.fadeIn();
x_pageContentsUpdated();
gapFill.audioFbResize(true);
});

Expand Down Expand Up @@ -484,6 +485,7 @@
if ($targetHolder.find("input.correct").length == $targetHolder.find("input").length) {
$("#feedbackTxt #txt").html(x_addLineBreaks(x_currentPageXML.getAttribute("feedback")));
$feedbackTxt.fadeIn();
x_pageContentsUpdated();
gapFill.audioFbResize(true);
}

Expand Down Expand Up @@ -603,6 +605,7 @@
$("#submitBtn").hide();
$("#feedbackTxt #txt").html(x_addLineBreaks(x_currentPageXML.getAttribute("feedback")));
$feedbackTxt.fadeIn();
x_pageContentsUpdated();
gapFill.audioFbResize(true);

finished = true;
Expand Down Expand Up @@ -654,6 +657,7 @@
$("#submitBtn").hide();
$("#feedbackTxt #txt").html(x_addLineBreaks(x_currentPageXML.getAttribute("feedback")));
$feedbackTxt.fadeIn();
x_pageContentsUpdated();
gapFill.audioFbResize(true);

finished = true;
Expand Down Expand Up @@ -825,6 +829,7 @@
$feedbackTxt.fadeIn();
gapFill.audioFbResize(true);
gapFill.dragDropSubmit();
x_pageContentsUpdated();
}
}

Expand Down Expand Up @@ -920,6 +925,7 @@
if (forced != true) {
$("#feedbackTxt #txt").html('<p>' + x_addLineBreaks(x_currentPageXML.getAttribute("gapFillIncomplete") != undefined && x_currentPageXML.getAttribute("gapFillIncomplete") != "" ? x_currentPageXML.getAttribute("gapFillIncomplete") : "Please complete the exercise.") + '</p>');
$feedbackTxt.fadeIn();
x_pageContentsUpdated();
}

// an attempt (even if partial) has been made
Expand Down Expand Up @@ -978,7 +984,8 @@
$("#feedbackTxt #txt").html(x_addLineBreaks(x_currentPageXML.getAttribute("feedback")));
$feedbackTxt.fadeIn();
gapFill.audioFbResize(true);

x_pageContentsUpdated();

finished = true;

} else {
Expand Down Expand Up @@ -1017,12 +1024,14 @@
$("#feedbackTxt #txt").html('<p>' + gapFillPartWrong + '</p>');
}
$feedbackTxt.fadeIn();
x_pageContentsUpdated();
}

// if force tracking mode is on then you must fully complete before checking answers
} else {
$("#feedbackTxt #txt").html('<p>' + x_addLineBreaks(x_currentPageXML.getAttribute("gapFillIncomplete") != undefined && x_currentPageXML.getAttribute("gapFillIncomplete") != "" ? x_currentPageXML.getAttribute("gapFillIncomplete") : "Please complete the exercise.") + '</p>');
$feedbackTxt.fadeIn();
x_pageContentsUpdated();
}
}
};
Expand All @@ -1035,6 +1044,7 @@
if (forced != true) {
$("#feedbackTxt #txt").html('<p>' + x_addLineBreaks(x_currentPageXML.getAttribute("gapFillIncomplete") != undefined && x_currentPageXML.getAttribute("gapFillIncomplete") != "" ? x_currentPageXML.getAttribute("gapFillIncomplete") : "Please complete the exercise.") + '</p>');
$feedbackTxt.fadeIn();
x_pageContentsUpdated();
}

// an attempt (even if partial) has been made
Expand Down Expand Up @@ -1103,7 +1113,8 @@
$("#showBtn,#submitBtn").hide();
$feedbackTxt.fadeIn();
gapFill.audioFbResize(true);

x_pageContentsUpdated();

finished = true;

} else {
Expand All @@ -1113,7 +1124,8 @@
$("#feedbackTxt #txt").html('<p>' + gapFillPartWrong + '</p>');
}
$feedbackTxt.fadeIn();

x_pageContentsUpdated();

if (this.isTracked) {
$("#submitBtn").hide();
$("#showBtn").show();
Expand All @@ -1124,6 +1136,7 @@
} else {
$("#feedbackTxt #txt").html('<p>' + x_addLineBreaks(x_currentPageXML.getAttribute("gapFillIncomplete") != undefined && x_currentPageXML.getAttribute("gapFillIncomplete") != "" ? x_currentPageXML.getAttribute("gapFillIncomplete") : "Please complete the exercise.") + '</p>');
$feedbackTxt.fadeIn();
x_pageContentsUpdated();
}
}
};
Expand All @@ -1136,6 +1149,7 @@
if (forced != true) {
$("#feedbackTxt #txt").html('<p>' + x_addLineBreaks(x_currentPageXML.getAttribute("gapFillIncomplete") != undefined && x_currentPageXML.getAttribute("gapFillIncomplete") != "" ? x_currentPageXML.getAttribute("gapFillIncomplete") : "Please complete the exercise.") + '</p>');
$feedbackTxt.fadeIn();
x_pageContentsUpdated();
}

// an attempt (even if partial) has been made
Expand Down Expand Up @@ -1266,6 +1280,7 @@
$("#labelHolder").hide();
$("#feedbackTxt #txt").html(x_addLineBreaks(x_currentPageXML.getAttribute("feedback")));
$feedbackTxt.fadeIn();
x_pageContentsUpdated();
gapFill.audioFbResize(true);
finished = true;
} else {
Expand All @@ -1275,12 +1290,14 @@
$("#feedbackTxt #txt").html('<p>' + x_addLineBreaks(x_currentPageXML.getAttribute("gapFillPartWrongTracking") != undefined && x_currentPageXML.getAttribute("gapFillPartWrongTracking") != "" ? x_currentPageXML.getAttribute("gapFillPartWrongTracking") : "Your correct answers are shown in green.") + '</p>');
}
$feedbackTxt.fadeIn();
x_pageContentsUpdated();
}

// if force tracking mode is on then you must fully complete before checking answers
} else {
$("#feedbackTxt #txt").html('<p>' + x_addLineBreaks(x_currentPageXML.getAttribute("gapFillIncomplete") != undefined && x_currentPageXML.getAttribute("gapFillIncomplete") != "" ? x_currentPageXML.getAttribute("gapFillIncomplete") : "Please complete the exercise.") + '</p>');
$feedbackTxt.fadeIn();
x_pageContentsUpdated();
}
}
}
Expand Down

0 comments on commit 621ea7c

Please sign in to comment.