Upgrade jQuery to 3.x on fallback login/registration screens (#7236)

55d46da5 · Andrew Morgan · GitHub · 24722de7 · 55d46da5 · 55d46da5
Unverified Commit 55d46da5 authored 4 years ago by Andrew Morgan Committed by GitHub 4 years ago
--- a/changelog.d/7236.misc
+++ b/changelog.d/7236.misc
+Upgrade jQuery to v3.4.1 on fallback login/registration pages.
\ No newline at end of file
--- a/synapse/static/client/login/index.html
+++ b/synapse/static/client/login/index.html
+<!doctype html>
 <html>
 <head>
 <title> Login </title>
 <meta name='viewport' content='width=device-width, initial-scale=1, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0'>
 <link rel="stylesheet" href="style.css">
-<script src="js/jquery-2.1.3.min.js"></script>
+<script src="js/jquery-3.4.1.min.js"></script>
 <script src="js/login.js"></script>
 </head>
 <body onload="matrixLogin.onLoad()">

--- a/synapse/static/client/login/js/jquery-2.1.3.min.js
+++ b/synapse/static/client/login/js/jquery-2.1.3.min.js
--- a/synapse/static/client/login/js/jquery-3.4.1.min.js
+++ b/synapse/static/client/login/js/jquery-3.4.1.min.js
--- a/synapse/static/client/login/js/login.js
+++ b/synapse/static/client/login/js/login.js
@@ -17,7 +17,7 @@ var submitPassword = function(user, pwd) {
    };
    $.post(matrixLogin.endpoint, JSON.stringify(data), function(response) {
        matrixLogin.onLogin(response);
-    }).error(errorFunc);
+    }).fail(errorFunc);
 };

 var submitToken = function(loginToken) {
@@ -29,7 +29,7 @@ var submitToken = function(loginToken) {
    };
    $.post(matrixLogin.endpoint, JSON.stringify(data), function(response) {
        matrixLogin.onLogin(response);
-    }).error(errorFunc);
+    }).fail(errorFunc);
 };

 var errorFunc = function(err) {
@@ -105,7 +105,7 @@ var fetch_info = function(cb) {
        }

        cb();
-    }).error(errorFunc);
+    }).fail(errorFunc);
 }

 matrixLogin.onLoad = function() {

--- a/synapse/static/client/register/index.html
+++ b/synapse/static/client/register/index.html
+<!doctype html>
 <html>
 <head>
 <title> Registration </title>
 <meta name='viewport' content='width=device-width, initial-scale=1, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0'> 
 <link rel="stylesheet" href="style.css">
-<script src="js/jquery-2.1.3.min.js"></script>
+<script src="js/jquery-3.4.1.min.js"></script>
 <script src="https://www.recaptcha.net/recaptcha/api/js/recaptcha_ajax.js"></script>
 <script src="register_config.js"></script>
 <script src="js/register.js"></script>

--- a/synapse/static/client/register/js/jquery-2.1.3.min.js
+++ b/synapse/static/client/register/js/jquery-2.1.3.min.js
--- a/synapse/static/client/register/js/jquery-3.4.1.min.js
+++ b/synapse/static/client/register/js/jquery-3.4.1.min.js
--- a/synapse/static/client/register/js/register.js
+++ b/synapse/static/client/register/js/register.js
@@ -33,7 +33,7 @@ var setupCaptcha = function() {
            callback: Recaptcha.focus_response_field
        });
        window.matrixRegistration.isUsingRecaptcha = true;
-    }).error(errorFunc);
+    }).fail(errorFunc);
    
 };

@@ -49,7 +49,7 @@ var submitCaptcha = function(user, pwd) {
    $.post(matrixRegistration.endpoint, JSON.stringify(data), function(response) {
        console.log("Success -> "+JSON.stringify(response));
        submitPassword(user, pwd, response.session);
-    }).error(function(err) {
+    }).fail(function(err) {
        Recaptcha.reload();
        errorFunc(err);
    });
@@ -67,7 +67,7 @@ var submitPassword = function(user, pwd, session) {
        matrixRegistration.onRegistered(
            response.home_server, response.user_id, response.access_token
        );
-    }).error(errorFunc);
+    }).fail(errorFunc);
 };

 var errorFunc = function(err) {