Merge "specials: Simplify return logic of various SpecialUserlogin methods"

diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index de34ffc..3693898 100644 (file)
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -23,6 +23,7 @@ production.
 * Update es5-shim from v4.0.0 to v4.1.5.
 * Update json2 from revision 2014-02-04 to 2015-05-03.
 * Update Sinon.JS from 1.10.3 to 1.15.0.
+* Upgrade jQuery Client from v1.0.0 to v2.0.0.
 * Added mediawiki/at-ease 1.0.0
 
 === Bug fixes in 1.26 ===

diff --git a/resources/lib/jquery.client/jquery.client.js b/resources/lib/jquery.client/jquery.client.js
index 1560c7d..8257d85 100644 (file)
--- a/resources/lib/jquery.client/jquery.client.js
+++ b/resources/lib/jquery.client/jquery.client.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery Client v1.0.0
+ * jQuery Client v2.0.0
  * https://www.mediawiki.org/wiki/JQuery_Client
  *
  * Copyright 2010-2015 jquery-client maintainers and other contributors.
@@ -182,9 +182,12 @@
                                        version = match[1];
                                }
                        }
-                       // And IE 12's different lies about not being IE
+                       // And MS Edge's lies about being Chrome
+                       //
+                       // It's different enough from classic IE Trident engine that they do this
+                       // to avoid getting caught by MSIE-specific browser sniffing.
                        if ( name === 'chrome' && ( match = ua.match( /\bedge\/([0-9\.]*)/ ) ) ) {
-                               name = 'msie';
+                               name = 'edge';
                                version = match[1];
                                layout = 'edge';
                                layoutversion = parseInt( match[1], 10 );