Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r129046221bc61bf76b85db3dec56fae24bc18cab -r3e5f23228af144f86f91a0dd45d342702d22c22d
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp (.../sbmtlearner.jsp) (revision 129046221bc61bf76b85db3dec56fae24bc18cab)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp (.../sbmtlearner.jsp) (revision 3e5f23228af144f86f91a0dd45d342702d22c22d)
@@ -173,30 +173,31 @@
if (uploadedFilesNumber < ${sessionMap.minLimitUploadNumber}) {
if (${sessionMap.mode eq 'author'}) {
- alert('' +
+ showToast('' +
'\n');
} else {
- alert('');
+ showToast('');
return false;
}
}
+ let finishFunction = function(){
+ disableButtons();
+ location.href = tUrl;
+ };
+
//let user confirm zero files upload
if (uploadedFilesNumber == 0) {
if (${sessionMap.lockOnFinish}) {
- if (!confirm("")) {
- return false;
- }
+ showConfirm("", finishFunction);
} else {
- if (!confirm("")) {
- return false;
- }
+ showConfirm("", finishFunction);
}
+ } else {
+ finishFunction();
}
- disableButtons();
- location.href = tUrl;
}
function clearFileError(errDivId) {
@@ -217,7 +218,7 @@
errDiv.append(error);
errDiv.css( "display", "block" );
} else {
- alert(error);
+ showToast(error);
}
}
@@ -253,20 +254,19 @@
function deleteLearnerFile(detailId, filename) {
var msg = '';
msg = msg.replace('{0}', filename);
- var answer = confirm(msg);
- if (answer) {
+ showConfirm(msg, function (){
$.ajax({
url: '',
data: 'detailId=' + detailId,
success: function () {
document.location.href = "learning/${sessionMap.mode}.do?toolSessionID=${sessionMap.toolSessionID}";
},
error: function(error){
- alert("readyState: "+xhr.readyState+"\nstatus: "+xhr.status);
- alert("responseText: "+xhr.responseText);
+ showToast("readyState: "+xhr.readyState+"\nstatus: "+xhr.status);
+ showToast("responseText: "+xhr.responseText);
}
});
- }
+ });
}