jenkins-bot has submitted this change and it was merged.
Change subject: jquery.client: Include platform in the profile cache key
......................................................................
jquery.client: Include platform in the profile cache key
When different tests run a similar userAgent string but with
a different platform, it returns an inappropiate cache object
e.g.
userAgent: Firefox
platform: Linux x86_64
-> { platform: 'linux' }
userAgent: Firefox
platform: MacIntel
-> { platform: 'linux' }
(instead of platform: 'mac' )
Change-Id: Iaf2a5711ace82cbd2b68486e9680c7a6bcb7f9da
---
M resources/jquery/jquery.client.js
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/jquery/jquery.client.js
b/resources/jquery/jquery.client.js
index f35782b..98ed46d 100644
--- a/resources/jquery/jquery.client.js
+++ b/resources/jquery/jquery.client.js
@@ -37,8 +37,9 @@
if ( nav === undefined ) {
nav = window.navigator;
}
+
// Use the cached version if possible
- if ( profileCache[nav.userAgent] === undefined ) {
+ if ( profileCache[ nav.userAgent + '|' + nav.platform ]
=== undefined ) {
var
versionNumber,
@@ -174,7 +175,7 @@
/* Caching */
- profileCache[nav.userAgent] = {
+ profileCache[ nav.userAgent + '|' +
nav.platform ] = {
name: name,
layout: layout,
layoutVersion: layoutversion,
@@ -184,7 +185,7 @@
versionNumber: versionNumber
};
}
- return profileCache[nav.userAgent];
+ return profileCache[ nav.userAgent + '|' + nav.platform
];
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/111674
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf2a5711ace82cbd2b68486e9680c7a6bcb7f9da
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
