From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Tue, 24 Nov 2015 20:55:07 +0000 (+0100)
Subject: jquery.accessKeyLabel: Update Opera access keys
X-Git-Tag: 1.31.0-rc.0~8881^2
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=af75537e537ab2229bc35e88ca42cb58ea79d790;p=lhc%2Fweb%2Fwiklou.git

jquery.accessKeyLabel: Update Opera access keys

Bug: T119521
Change-Id: Ib2d121af55e890504dd0c643e520a12ab5745836
---

diff --git a/resources/src/jquery/jquery.accessKeyLabel.js b/resources/src/jquery/jquery.accessKeyLabel.js
index 92f8eb9c54..afa720117a 100644
--- a/resources/src/jquery/jquery.accessKeyLabel.js
+++ b/resources/src/jquery/jquery.accessKeyLabel.js
@@ -33,12 +33,12 @@ function getAccessKeyPrefix( ua ) {
 	var profile = $.client.profile( ua ),
 		accessKeyPrefix = 'alt-';
 
-	// Opera on any platform
-	if ( profile.name === 'opera' ) {
+	// Classic Opera on any platform
+	if ( profile.name === 'opera' && profile.versionNumber < 15 ) {
 		accessKeyPrefix = 'shift-esc-';
 
-	// Chrome on any platform
-	} else if ( profile.name === 'chrome' ) {
+	// Chrome and modern Opera on any platform
+	} else if ( profile.name === 'chrome' || profile.name === 'opera' ) {
 		accessKeyPrefix = (
 			profile.platform === 'mac'
 				// Chrome on Mac
diff --git a/tests/qunit/suites/resources/jquery/jquery.accessKeyLabel.test.js b/tests/qunit/suites/resources/jquery/jquery.accessKeyLabel.test.js
index cf34fc1103..532a6cedad 100644
--- a/tests/qunit/suites/resources/jquery/jquery.accessKeyLabel.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.accessKeyLabel.test.js
@@ -22,7 +22,7 @@
 			[ 'Mozilla/5.0 (X11; Linux i686) KHTML/4.9.1 (like Gecko) Konqueror/4.9', 'Linux i686', 'ctrl-' ],
 			// Opera
 			[ 'Opera/9.80 (Windows NT 5.1)', 'Win32', 'shift-esc-' ],
-			[ 'Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.52 Safari/537.36 OPR/15.0.1147.130', 'Win32', 'shift-esc-' ],
+			[ 'Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.52 Safari/537.36 OPR/15.0.1147.130', 'Win32', 'alt-shift-' ],
 			// Chrome
 			[ 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_5_8) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.112 Safari/534.30', 'MacIntel', 'ctrl-option-' ],
 			[ 'Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.68 Safari/534.30', 'Linux i686', 'alt-shift-' ]