SAK-41936 - SignUp/Meeting Summary : 'Show the other default settings…

…' not in Tab order (sakaiproject#8053)
brdebr · Mar 19, 2020 · 93b39ec · 93b39ec
1 parent c2dd5a9
commit 93b39ec
Showing 1 changed file with 31 additions and 5 deletions.
diff --git a/signup/tool/src/webapp/signup/newMeeting/step2.jsp b/signup/tool/src/webapp/signup/newMeeting/step2.jsp
@@ -15,7 +15,30 @@
 <h:outputText value="#{Portal.latestJQuery}" escape="false"/>
 	  <script src="/sakai-signup-tool/js/signupScript.js"></script>
 	  <script>
+
+			function a11yClick(event){
+				if(event.type === 'click'){
+					return true;
+				}
+				else if(event.type === 'keypress'){
+					var code = event.charCode || event.keyCode;
+					if((code === 32)|| (code === 13)){
+						return true;
+					}
+				}
+				else{
+					return false;
+				}
+			}
+
 			jQuery(document).ready(function() {
+				$('#meeting\\:imageOpen_otherSetting, #meeting\\:imageClose_otherSetting').attr('tabindex', '0');
+				$('#meeting\\:imageOpen_otherSetting, #meeting\\:imageClose_otherSetting').on('click keypress', function() {
+					if(a11yClick(event) === true){
+						showOtherDefaultSettings('meeting:imageOpen_otherSetting','meeting:imageClose_otherSetting','meeting:otherSetting');
+					}
+				});
+
 				isShowEmailChoice();
 				var menuLink = $('#signupAddMeetingMenuLink');
 				menuLink.addClass('current');
@@ -45,6 +68,9 @@
 				var otherDefaultSettings = document.getElementById("otherDefaultSettings");
 				switchShowOrHide(otherDefaultSettings);
 			}
+
+
+
 		</script>
 
 
@@ -458,15 +484,15 @@
 							<h:outputText value="#{msgs.event_other_default_setting}" escape="false" styleClass="titleText"/>
 						</h:panelGroup>
 						<h:panelGroup styleClass="col-xs-12 col-md-9 valueColumn" layout="block" rendered="#{!NewSignupMeetingBean.announcementType}">
-							<h:panelGroup>	
-								<h:outputLabel  id="imageOpen_otherSetting" style="display:none" styleClass="activeTag" onclick="showOtherDefaultSettings('meeting:imageOpen_otherSetting','meeting:imageClose_otherSetting','meeting:otherSetting');">
+							<h:panelGroup>
+								<h:panelGroup id="imageOpen_otherSetting" style="display:none" styleClass="activeTag">
 									<h:graphicImage value="/images/open.gif"  alt="open" title="Click to hide details." style="border:none;vertical-align: middle;" styleClass="openCloseImageIcon"/>
 									<h:outputText value="#{msgs.event_close_other_default_setting}" escape="false" style="vertical-align: middle;"/>
-								</h:outputLabel>
-								<h:outputLabel id="imageClose_otherSetting" styleClass="activeTag" onclick="showOtherDefaultSettings('meeting:imageOpen_otherSetting','meeting:imageClose_otherSetting','meeting:otherSetting');">
+								</h:panelGroup>
+								<h:panelGroup id="imageClose_otherSetting" styleClass="activeTag">
 									<h:graphicImage value="/images/closed.gif" alt="close" title="Click to show details." style="border:none;vertical-align:middle;" styleClass="openCloseImageIcon"/>
 									<h:outputText value="#{msgs.event_show_other_default_setting}" escape="false" style="vertical-align: middle;"/>
-								</h:outputLabel>
+								</h:panelGroup>
 							</h:panelGroup>
 						</h:panelGroup>
 					</div>