summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-06-26 22:46:23 +0100
committerRichard van der Hoff <richard@matrix.org>2019-06-26 22:46:23 +0100
commit0ade403f55dd9f6cab90e1e4f0a9241940a437f2 (patch)
treee1e40ae2d24cec1d767eddd0431b598c99052850 /synapse
parentMerge branch 'develop' into rav/saml2_client (diff)
downloadsynapse-0ade403f55dd9f6cab90e1e4f0a9241940a437f2.tar.xz
Revert redundant changes to static js
Diffstat (limited to 'synapse')
-rw-r--r--synapse/static/client/login/js/login.js6
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/static/client/login/js/login.js b/synapse/static/client/login/js/login.js
index 9b9e73c41b..e02663f50e 100644
--- a/synapse/static/client/login/js/login.js
+++ b/synapse/static/client/login/js/login.js
@@ -56,7 +56,6 @@ var show_login = function() {
     }
 
     if (matrixLogin.serverAcceptsSso) {
-        $("#sso_form").attr("action", "/_matrix/client/r0/login/sso/redirect");
         $("#sso_flow").show();
     } else if (matrixLogin.serverAcceptsCas) {
         $("#sso_form").attr("action", "/_matrix/client/r0/login/cas/redirect");
@@ -80,7 +79,7 @@ var fetch_info = function(cb) {
     $.get(matrixLogin.endpoint, function(response) {
         var serverAcceptsPassword = false;
         var serverAcceptsCas = false;
-        for (var i = 0; i < response.flows.length; i++) {
+        for (var i=0; i<response.flows.length; i++) {
             var flow = response.flows[i];
             if ("m.login.cas" === flow.type) {
                 matrixLogin.serverAcceptsCas = true;
@@ -122,7 +121,6 @@ matrixLogin.onLogin = function(response) {
     // clobber this function
     console.log("onLogin - This function should be replaced to proceed.");
     console.log(response);
-    alert("Login successful!");
 };
 
 var parseQsFromUrl = function(query) {
@@ -145,7 +143,7 @@ var try_token = function() {
     if (pos == -1) {
         return false;
     }
-    var qs = parseQsFromUrl(window.location.href.substr(pos + 1));
+    var qs = parseQsFromUrl(window.location.href.substr(pos+1));
 
     var loginToken = qs.loginToken;