jenkins-bot has submitted this change and it was merged.
Change subject: jquery.client: Update to upstream from 92f06b4a in
mediawiki/core.git
......................................................................
jquery.client: Update to upstream from 92f06b4a in mediawiki/core.git
Change-Id: Ica5079f45a4dd1bd24847829a338e54ffc731bda
---
M modules/jquery/jquery.client.js
1 file changed, 11 insertions(+), 4 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/jquery/jquery.client.js b/modules/jquery/jquery.client.js
index 42e76eb..5a95dc5 100644
--- a/modules/jquery/jquery.client.js
+++ b/modules/jquery/jquery.client.js
@@ -82,15 +82,15 @@
// Tanslations for conforming browser
names
nameTranslations = [],
// Names of known layout engines
- layouts = ['gecko', 'konqueror',
'msie', 'opera', 'webkit'],
+ layouts = ['gecko', 'konqueror',
'msie', 'trident', 'opera', 'webkit'],
// Translations for conforming layout
names
layoutTranslations = [ ['konqueror',
'khtml'], ['msie', 'trident'], ['opera', 'presto'] ],
// Names of supported layout engines
for version number
- layoutVersions = ['applewebkit',
'gecko'],
+ layoutVersions = ['applewebkit',
'gecko', 'trident'],
// Names of known operating systems
- platforms = ['win', 'mac', 'linux',
'sunos', 'solaris', 'iphone'],
+ platforms = ['win', 'wow64', 'mac',
'linux', 'sunos', 'solaris', 'iphone'],
// Translations for conforming
operating system names
- platformTranslations = [ ['sunos',
'solaris'] ],
+ platformTranslations = [ ['sunos',
'solaris'], ['wow64', 'win'] ],
/* Methods */
@@ -162,6 +162,13 @@
version = match[1];
}
}
+ // And IE 11's lies about being not being IE
+ if ( layout === 'trident' && layoutversion >= 7
&& ( match = ua.match( /\brv[ :\/]([0-9\.]*)/ ) ) ) {
+ if ( match[1] ) {
+ name = 'msie';
+ version = match[1];
+ }
+ }
versionNumber = parseFloat( version, 10 ) ||
0.0;
--
To view, visit https://gerrit.wikimedia.org/r/73037
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica5079f45a4dd1bd24847829a338e54ffc731bda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Matmarex <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
