From aaa79e0c023696aa714fef3b11067763282e1900 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Minh=20Nguy=E1=BB=85n?= Date: Sat, 28 Apr 2012 22:30:22 +0000 Subject: [PATCH] (bug 36329) Fix accesskey tooltip for Firefox 14 on Mac Should use "ctrl-option-" prefix Change-Id: I87463fc6043fb17cab70956f65fd9da3cdd7477d --- RELEASE-NOTES-1.20 | 8 +++++--- resources/mediawiki/mediawiki.util.js | 6 +++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20 index cdd27072ec..5a2d9a3bd3 100644 --- a/RELEASE-NOTES-1.20 +++ b/RELEASE-NOTES-1.20 @@ -231,7 +231,8 @@ upgrade PHP if you have not done so prior to upgrading MediaWiki. * (bug 34313) MediaWiki API intro message about "HTML format" should mention the format parameter. * (bug 32384) Allow descending order for list=watchlistraw. -* (bug 31883) Limit of bkusers of list=blocks and titles of action=query is not documented in API help. +* (bug 31883) Limit of bkusers of list=blocks and titles of action=query is + not documented in API help. * (bug 32492) API now allows editing using pageid. * (bug 32497) API now allows changing of protection level using pageid. * (bug 32498) API now allows comparing pages using pageids. @@ -260,8 +261,9 @@ upgrade PHP if you have not done so prior to upgrading MediaWiki. * Watchlist notification timestamp may be queried by page and may be updated via the API. * (bug 38904) prop=revisions&rvstart=... no longer blows up when continuing. * (bug 39032) ApiQuery generates help in constructor. -* (bug 11142) Improve file extension blacklist error reporting in API upload -* (bug 39635) PostgreSQL LOCK IN SHARE MODE option is a syntax error +* (bug 11142) Improve file extension blacklist error reporting in API upload. +* (bug 39635) PostgreSQL LOCK IN SHARE MODE option is a syntax error. +* (bug 36329) Accesskey tooltips for Firefox 14 on Mac should use "ctrl-option-" prefix. === Languages updated in 1.20 === diff --git a/resources/mediawiki/mediawiki.util.js b/resources/mediawiki/mediawiki.util.js index 7e2bab8239..c697692fb4 100644 --- a/resources/mediawiki/mediawiki.util.js +++ b/resources/mediawiki/mediawiki.util.js @@ -50,7 +50,11 @@ && profile.name === 'safari' && profile.layoutVersion > 526 ) { util.tooltipAccessKeyPrefix = 'ctrl-alt-'; - + // Firefox 14+ on Mac + } else if ( profile.platform === 'mac' + && profile.name === 'firefox' + && profile.versionNumber >= 14 ) { + util.tooltipAccessKeyPrefix = 'ctrl-option-'; // Safari/Konqueror on any platform, or any browser on Mac // (but not Safari on Windows) } else if ( !( profile.platform === 'win' && profile.name === 'safari' ) -- 2.20.1