Wordpress 3.2

[autoinstalls/wordpress.git] / wp-includes / js / tinymce / themes / advanced / js / charmap.js

diff --git a/wp-includes/js/tinymce/themes/advanced/js/charmap.js b/wp-includes/js/tinymce/themes/advanced/js/charmap.js
index 53a26836b8ebb4e18b39c60cbaf49d7b4f170879..78bc080e182b54afccae2a10ad1ec60a86516fec 100644 (file)
--- a/wp-includes/js/tinymce/themes/advanced/js/charmap.js
+++ b/wp-includes/js/tinymce/themes/advanced/js/charmap.js
@@ -173,7 +173,7 @@ var charmap = [
        ['ý',  'ý',  true, 'y - acute'],
        ['þ',   'þ',  true, 'thorn'],
        ['ÿ',    'ÿ',  true, 'y - diaeresis'],
-    ['Α',   'Α',  true, 'Alpha'],
+       ['Α',   'Α',  true, 'Alpha'],
        ['Β',    'Β',  true, 'Beta'],
        ['Γ',   'Γ',  true, 'Gamma'],
        ['Δ',   'Δ',  true, 'Delta'],
@@ -258,8 +258,8 @@ var charmap = [
        ['⌋',  '⌋', false,'right floor'],
        ['⟨',    '〈', false,'left-pointing angle bracket'],
        ['⟩',    '〉', false,'right-pointing angle bracket'],
-       ['◊',     '◊', true,'lozenge'],
-       ['♠',  '♠', false,'black spade suit'],
+       ['◊',     '◊', true, 'lozenge'],
+       ['♠',  '♠', true, 'black spade suit'],
        ['♣',   '♣', true, 'black club suit'],
        ['♥',  '♥', true, 'black heart suit'],
        ['♦',   '♦', true, 'black diamond suit'],
@@ -275,19 +275,38 @@ var charmap = [
 
 tinyMCEPopup.onInit.add(function() {
        tinyMCEPopup.dom.setHTML('charmapView', renderCharMapHTML());
+       addKeyboardNavigation();
 });
 
+function addKeyboardNavigation(){
+       var tableElm, cells, settings;
+
+       cells = tinyMCEPopup.dom.select(".charmaplink", "charmapgroup");
+
+       settings ={
+               root: "charmapgroup",
+               items: cells
+       };
+
+       tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', settings, tinyMCEPopup.dom);
+}
+
 function renderCharMapHTML() {
        var charsPerRow = 20, tdWidth=20, tdHeight=20, i;
-       var html = '<table border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth*charsPerRow) + '"><tr height="' + tdHeight + '">';
+       var html = '<div id="charmapgroup" aria-labelledby="charmap_label" tabindex="0" role="listbox">'+
+       '<table role="presentation" border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth*charsPerRow) + 
+       '"><tr height="' + tdHeight + '">';
        var cols=-1;
 
        for (i=0; i<charmap.length; i++) {
+               var previewCharFn;
+
                if (charmap[i][2]==true) {
                        cols++;
+                       previewCharFn = 'previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');';
                        html += ''
                                + '<td class="charmap">'
-                               + '<a onmouseover="previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');" onfocus="previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');" href="javascript:void(0)" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + '">'
+                               + '<a class="charmaplink" role="button" onmouseover="'+previewCharFn+'" onfocus="'+previewCharFn+'" href="javascript:void(0)" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + '">'
                                + charmap[i][1]
                                + '</a></td>';
                        if ((cols+1) % charsPerRow == 0)
@@ -301,7 +320,8 @@ function renderCharMapHTML() {
                        html += '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap">&nbsp;</td>';
        }
 
-       html += '</tr></table>';
+       html += '</tr></table></div>';
+       html = html.replace(/<tr height="20"><\/tr>/g, '');
 
        return html;
 }