From 849bce67427d585aba559af9d70545bef2a9d611 Mon Sep 17 00:00:00 2001 From: thekodester Date: Thu, 1 Aug 2019 11:22:38 -0400 Subject: [PATCH 01/10] Fixes Bugs with Autogenerated Close Buttons Addresses issues rised in #8696 and #8697. --- src/plugins/lightbox/lightbox.js | 16 ++++----- src/plugins/overlay/overlay.js | 56 +++++++++++++++----------------- 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/src/plugins/lightbox/lightbox.js b/src/plugins/lightbox/lightbox.js index b1d1cd0a8bf..816ebb75ece 100644 --- a/src/plugins/lightbox/lightbox.js +++ b/src/plugins/lightbox/lightbox.js @@ -120,7 +120,8 @@ var componentName = "wb-lbx", if ( !i18nText ) { i18n = wb.i18n; i18nText = { - fClose: i18n( "close" ), + close: i18n( "close" ), + oClose: i18n( "overlay-close" ), tClose: i18n( "overlay-close" ) + i18n( "space" ) + i18n( "esc-key" ), tLoading: i18n( "load" ), gallery: { @@ -269,21 +270,18 @@ var componentName = "wb-lbx", hasFooter = footer.length, hasButton = hasFooter && $( footer ).find( ".popup-modal-dismiss" ).length !== 0, closeClassFtr = "popup-modal-dismiss", - closeTextFtr = i18nText.fClose, - spanTextFtr, overlayCloseFtr; + closeTextFtr = i18nText.close, + spanTextFtr = i18nText.oClose, + overlayCloseFtr; if ( !hasButton ) { - if ( hasFooter ) { - spanTextFtr = footer.innerHTML + i18nText.tClose; - } else { + if ( !hasFooter ) { footer = document.createElement( "div" ); footer.setAttribute( "class", "modal-footer" ); - spanTextFtr = i18nText.tClose; } - spanTextFtr = spanTextFtr.replace( "'", "'" ); overlayCloseFtr = ""; diff --git a/src/plugins/overlay/overlay.js b/src/plugins/overlay/overlay.js index 2bcd511b2ad..ead4e1c99f2 100644 --- a/src/plugins/overlay/overlay.js +++ b/src/plugins/overlay/overlay.js @@ -36,7 +36,7 @@ var componentName = "wb-overlay", // returns DOM object = proceed with init // returns undefined = do not proceed with init (e.g., already initialized) var elm = wb.init( event, componentName, selector ), - $elm, footer, closeTextFtr, overlayCloseFtr, $header, closeText, overlayClose; + $elm, footer, $header, closeText, overlayClose; if ( elm ) { $elm = $( elm ); @@ -57,36 +57,34 @@ var componentName = "wb-overlay", var isPanel = ( $elm.attr( "class" ).indexOf( "wb-panel" ) > -1 ) ? true : false, isPopup = ( $elm.attr( "class" ).indexOf( "wb-popup" ) > -1 ) ? true : false; if ( isPanel || isPopup ) { - var hasFooter, closeClassFtr, spanTextFtr, buttonStyle = ""; - footer = $elm.find( ".modal-footer" )[ 0 ]; - hasFooter = ( footer && footer.length !== 0 ) ? true : false; - closeClassFtr = ( $elm.hasClass( "wb-panel-l" ) ? "pull-right " : "pull-left " ) + closeClass; - - if ( hasFooter ) { - spanTextFtr = footer.innerHTML + i18nText.space + i18nText.esc; - } else { - footer = document.createElement( "div" ); - footer.setAttribute( "class", "modal-footer" ); - spanTextFtr = i18nText.esc; - } - - closeTextFtr = i18nText.close; - spanTextFtr = spanTextFtr.replace( "'", "'" ); - - if ( isPopup ) { - footer.style.border = "0"; - } - - overlayCloseFtr = ""; - $( footer ).append( overlayCloseFtr ); - if ( !hasFooter ) { - $elm.append( footer ); + var hasFooter = ( footer && footer.length !== 0 ) ? true : false, + hasButton = hasFooter && $( footer ).find( closeClass ).length !== 0, + closeClassFtr = ( $elm.hasClass( "wb-panel-l" ) ? "pull-right " : "pull-left " ) + closeClass, + closeTextFtr = i18nText.close, + spanTextFtr = i18nText.closeOverlay, + overlayCloseFtr; + + if ( !hasButton ) { + if ( !hasFooter ) { + footer = document.createElement( "div" ); + footer.setAttribute( "class", "modal-footer" ); + } + + if ( isPopup ) { + footer.style.border = "0"; + } + + overlayCloseFtr = ""; + + $( footer ).append( overlayCloseFtr ); + if ( !hasFooter ) { + $elm.append( footer ); + } } } From 188557c7cc9293b0eb5afde424356c8239c649ad Mon Sep 17 00:00:00 2001 From: Eric Dunsworth <1907279+EricDunsworth@users.noreply.github.com> Date: Mon, 5 Aug 2019 16:23:10 -0400 Subject: [PATCH 02/10] Web Accessibility Assessment Methodology: Remove placeholder link from docs --- site/pages/docs/ref/wamethod/wamethod-en.hbs | 3 +-- site/pages/docs/ref/wamethod/wamethod-fr.hbs | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/site/pages/docs/ref/wamethod/wamethod-en.hbs b/site/pages/docs/ref/wamethod/wamethod-en.hbs index a631df1c3cc..08f155059c9 100644 --- a/site/pages/docs/ref/wamethod/wamethod-en.hbs +++ b/site/pages/docs/ref/wamethod/wamethod-en.hbs @@ -6,7 +6,7 @@ "categoryfile": "other", "description": "Provides an assessment methodology that assists with measuring conformance to the Web Content Accessibility Guidelines (WCAG) 2.0 Level A, AA and AAA Success Criteria.", "altLangPrefix": "wamethod", - "dateModified": "2014-02-19" + "dateModified": "2019-08-05" } --- @@ -25,7 +25,6 @@

Working example

-

Link to a working example