| Index: trunk/phase3/skins/common/wikibits.js |
| — | — | @@ -3,8 +3,13 @@ |
| 4 | 4 | var clientPC = navigator.userAgent.toLowerCase(); // Get client info |
| 5 | 5 | var is_gecko = /gecko/.test( clientPC ) && |
| 6 | 6 | !/khtml|spoofer|netscape\/7\.0/.test(clientPC); |
| 7 | | -var is_safari = clientPC.indexOf('applewebkit') != -1 && |
| 8 | | - clientPC.indexOf('spoofer') == -1; |
| | 7 | +var webkit_match = clientPC.match(/applewebkit\/(\d+)/); |
| | 8 | +if (webkit_match) { |
| | 9 | + var is_safari = clientPC.indexOf('applewebkit') != -1 && |
| | 10 | + clientPC.indexOf('spoofer') == -1; |
| | 11 | + var is_safari_win = is_safari && clientPC.indexOf('windows') != -1; |
| | 12 | + var webkit_version = parseInt(webkit_match[1]); |
| | 13 | +} |
| 9 | 14 | var is_khtml = navigator.vendor == 'KDE' || |
| 10 | 15 | ( document.childNodes && !document.all && !navigator.taintEnabled ); |
| 11 | 16 | // For accesskeys; note that FF3+ is included here! |
| — | — | @@ -201,9 +206,11 @@ |
| 202 | 207 | var tooltipAccessKeyPrefix = 'alt-'; |
| 203 | 208 | if (is_opera) { |
| 204 | 209 | tooltipAccessKeyPrefix = 'shift-esc-'; |
| 205 | | -} else if (is_safari |
| 206 | | - || navigator.userAgent.toLowerCase().indexOf('mac') != -1 |
| 207 | | - || navigator.userAgent.toLowerCase().indexOf('konqueror') != -1 ) { |
| | 210 | +} else if (!is_safari_win && is_safari && webkit_version > 526) { |
| | 211 | + tooltipAccessKeyPrefix = 'ctrl-alt-'; |
| | 212 | +} else if (!is_safari_win && (is_safari |
| | 213 | + || clientPC.indexOf('mac') != -1 |
| | 214 | + || clientPC.indexOf('konqueror') != -1 )) { |
| 208 | 215 | tooltipAccessKeyPrefix = 'ctrl-'; |
| 209 | 216 | } else if (is_ff2) { |
| 210 | 217 | tooltipAccessKeyPrefix = 'alt-shift-'; |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1339,7 +1339,7 @@ |
| 1340 | 1340 | * to ensure that client-side caches don't keep obsolete copies of global |
| 1341 | 1341 | * styles. |
| 1342 | 1342 | */ |
| 1343 | | -$wgStyleVersion = '153'; |
| | 1343 | +$wgStyleVersion = '154'; |
| 1344 | 1344 | |
| 1345 | 1345 | |
| 1346 | 1346 | # Server-side caching: |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -342,7 +342,9 @@ |
| 343 | 343 | $wgGroupPermissions[]['noratelimit']. |
| 344 | 344 | * (Bug 13828) Split parameter $1 of MediaWiki:Missingarticle into $1 (=title) |
| 345 | 345 | and $2 (=revision numbers) |
| | 346 | +* (bug 14401) Fix Safari access key tooltips for Windows and >3.1 Mac versions |
| 346 | 347 | |
| | 348 | + |
| 347 | 349 | === API changes in 1.13 === |
| 348 | 350 | |
| 349 | 351 | * Fixing main page display in meta=siteinfo |