MDL-44227 Atto: the screenreader helper now displays some texts when …

…alt or title don\'t exist
reskit · Mar 26, 2014 · 7ca3ad9 · 7ca3ad9
1 parent e7109b5
commit 7ca3ad9
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 4 deletions.
diff --git a/...ld/moodle-atto_accessibilityhelper-button/moodle-atto_accessibilityhelper-button-debug.js b/...ld/moodle-atto_accessibilityhelper-button/moodle-atto_accessibilityhelper-button-debug.js
@@ -138,9 +138,19 @@ M.atto_accessibilityhelper = M.atto_accessibilityhelper || {
             listitem, selectimage;
 
         editable.all('img').each(function(image) {
+
+            // Get the alt or title or img url of the image.
+            var imgalt = image.getAttribute('alt');
+            if (imgalt === '') {
+                imgalt = image.getAttribute('title');
+                if (imgalt === '') {
+                    imgalt = image.getAttribute('src');
+                }
+            }
+
             selectimage = Y.Node.create('<a href="#" title="' +
                                        M.util.get_string('selectimage', 'atto_accessibilityhelper') + '">' +
-                                       Y.Escape.html(image.getAttribute('alt')) +
+                                       Y.Escape.html(imgalt) +
                                        '</a>');
 
             selectimage.setData('sourceimage', image);

diff --git a/...uild/moodle-atto_accessibilityhelper-button/moodle-atto_accessibilityhelper-button-min.js b/...uild/moodle-atto_accessibilityhelper-button/moodle-atto_accessibilityhelper-button-min.js
diff --git a/...ui/build/moodle-atto_accessibilityhelper-button/moodle-atto_accessibilityhelper-button.js b/...ui/build/moodle-atto_accessibilityhelper-button/moodle-atto_accessibilityhelper-button.js
@@ -138,9 +138,19 @@ M.atto_accessibilityhelper = M.atto_accessibilityhelper || {
             listitem, selectimage;
 
         editable.all('img').each(function(image) {
+
+            // Get the alt or title or img url of the image.
+            var imgalt = image.getAttribute('alt');
+            if (imgalt === '') {
+                imgalt = image.getAttribute('title');
+                if (imgalt === '') {
+                    imgalt = image.getAttribute('src');
+                }
+            }
+
             selectimage = Y.Node.create('<a href="#" title="' +
                                        M.util.get_string('selectimage', 'atto_accessibilityhelper') + '">' +
-                                       Y.Escape.html(image.getAttribute('alt')) +
+                                       Y.Escape.html(imgalt) +
                                        '</a>');
 
             selectimage.setData('sourceimage', image);

diff --git a/lib/editor/atto/plugins/accessibilityhelper/yui/src/button/js/button.js b/lib/editor/atto/plugins/accessibilityhelper/yui/src/button/js/button.js
@@ -136,9 +136,19 @@ M.atto_accessibilityhelper = M.atto_accessibilityhelper || {
             listitem, selectimage;
 
         editable.all('img').each(function(image) {
+
+            // Get the alt or title or img url of the image.
+            var imgalt = image.getAttribute('alt');
+            if (imgalt === '') {
+                imgalt = image.getAttribute('title');
+                if (imgalt === '') {
+                    imgalt = image.getAttribute('src');
+                }
+            }
+
             selectimage = Y.Node.create('<a href="#" title="' +
                                        M.util.get_string('selectimage', 'atto_accessibilityhelper') + '">' +
-                                       Y.Escape.html(image.getAttribute('alt')) +
+                                       Y.Escape.html(imgalt) +
                                        '</a>');
 
             selectimage.setData('sourceimage', image);