This is an automated email from the ASF dual-hosted git repository.

svenmeier pushed a commit to branch wicket-8.x
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/wicket-8.x by this push:
     new ded2da3  WICKET-6753 dont set aria-labelledBy
ded2da3 is described below

commit ded2da3371f4877f6821ff2d6767b832b42d0e95
Author: Sven Meier <[email protected]>
AuthorDate: Thu Mar 5 21:05:31 2020 +0100

    WICKET-6753 dont set aria-labelledBy
    
    aria-label would be correct but unnecessary, since aria-labelledby is 
already set to id of captionText
---
 .../apache/wicket/extensions/ajax/markup/html/modal/res/modal.js   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git 
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
 
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
index b4293c5..3e23b26 100644
--- 
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
+++ 
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
@@ -545,8 +545,6 @@
                        // if the title is specified set it
                        if (this.settings.title != null) {
                                this.captionText.innerHTML = 
this.settings.title;
-                               // 
http://www.w3.org/TR/wai-aria/states_and_properties#aria-labelledby
-                               this.window.setAttribute('aria-labelledBy', 
this.settings.title);
                        }
 
                        // initial width and height
@@ -755,15 +753,12 @@
                                if (this.content.contentWindow.document.title) {
                                        if (this.captionText.innerHTML !== 
this.content.contentWindow.document.title) {
                                                this.captionText.innerHTML = 
this.content.contentWindow.document.title;
-                                               // 
http://www.w3.org/TR/wai-aria/states_and_properties#aria-labelledby
-                                               
this.window.setAttribute('aria-labelledBy', 
this.content.contentWindow.document.title);
 
                                                // konqueror doesn't refresh 
caption text properly
                                                if (Wicket.Browser.isKHTML()) {
                                                        
this.captionText.style.display = 'none';
                                                        
window.setTimeout(Wicket.bind(function() { 
this.captionText.style.display="block";}, this), 0);
                                                }
-
                                        }
                                }
                        } catch (ignore) {
@@ -1038,7 +1033,7 @@
         */
        Wicket.Window.getMarkup = function(idWindow, idClassElement, idCaption, 
idContent, idTop, idTopLeft, idTopRight, idLeft, idRight, idBottomLeft, 
idBottomRight, idBottom, idCaptionText, isFrame) {
                var s =
-                               "<div class=\"wicket-modal\" 
id=\""+idWindow+"\" role=\"dialog\" aria-labelledBy=\""+idCaptionText+"\" 
style=\"top: 10px; left: 10px; width: 100px;\"><form 
style='background-color:transparent;padding:0px;margin:0px;border-width:0px;position:static'>"+
+                               "<div class=\"wicket-modal\" 
id=\""+idWindow+"\" role=\"dialog\" aria-labelledby=\""+idCaptionText+"\" 
style=\"top: 10px; left: 10px; width: 100px;\"><form 
style='background-color:transparent;padding:0px;margin:0px;border-width:0px;position:static'>"+
                                "<div id=\""+idClassElement+"\">"+
 
                                        "<div class=\"w_top_1\">"+

Reply via email to