SAK-44248 use blockUI to prevent user from mashing Question Progress …

…links (sakaiproject#8535)
jake-shobin · Sep 30, 2020 · 1e31b17 · 1e31b17
1 parent 842f955
commit 1e31b17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/samigo/samigo-app/src/webapp/js/questionProgress.js b/samigo/samigo-app/src/webapp/js/questionProgress.js
@@ -188,7 +188,8 @@
 
 	questionProgress.disableLink = function(link) {
 		link.style.display = 'none';
-		link.parentNode.firstChild.style.display = 'inline-block';
+		link.parentNode.firstChild.style.display = 'inline-block'; // This displays the loading.gif spinner
+		$.blockUI({ message: '<h3>' + please_wait + ' <img src="/library/image/sakai/spinner.gif" /></h3>', overlayCSS: { backgroundColor: '#ccc', opacity: 0.25} });
 		return true;
 	};
 }( window.questionProgress = window.questionProgress || {}, jQuery )) ;
diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/questionProgress.jspf b/samigo/samigo-app/src/webapp/jsf/delivery/questionProgress.jspf
@@ -58,7 +58,7 @@
 		<f:verbatim><p class="progressItem"></f:verbatim>
               <h:panelGroup styleClass="#{((question.number eq delivery.questionIndex+1) and (part.number eq delivery.partIndex+1)) ? 'currentQuestion' : ''} #{((delivery.navigation eq '1') and ((part.number le delivery.partIndex+1 and question.number lt delivery.questionIndex+1) or (part.number lt delivery.partIndex+1))) ? 'linearPastQuestion' : ''}">
 		<h:graphicImage alt="Loading question..." url="/images/loading.gif" style="display:none;padding-left:1em;"/>
-		<h:commandLink title="#{question.strippedText} (#{question.pointsDisplayString}#{question.roundedMaxPoints} #{deliveryMessages.pt})" action="#{delivery.gotoQuestion}" rendered="#{delivery.navigation eq '2'}" onmouseup="questionProgress.disableLink(this); serializeImagePoints();">
+		<h:commandLink title="#{question.strippedText} (#{question.pointsDisplayString}#{question.roundedMaxPoints} #{deliveryMessages.pt})" action="#{delivery.gotoQuestion}" rendered="#{delivery.navigation eq '2'}" onclick="questionProgress.disableLink(this); serializeImagePoints();">
                 <h:outputText escape="false" value="#{question.sequence} " >
 			<f:convertNumber maxFractionDigits="2"/>
         	</h:outputText>