Merge remote-tracking branch 'upstream/pull/4744'

[rails.git] / app / assets / javascripts / login.js

diff --git a/app/assets/javascripts/login.js b/app/assets/javascripts/login.js
index 8963c07b64c28ccd66cc13d2677ba5fbae2b6362..43e2cf6606361e83b74408ef998f2cf54ae534ae 100644 (file)
--- a/app/assets/javascripts/login.js
+++ b/app/assets/javascripts/login.js
@@ -14,7 +14,8 @@ $(document).ready(function () {
   });
 
   // Add click handler to show OpenID field
   });
 
   // Add click handler to show OpenID field

-  $("#openid_open_url").click(function () {
+  $("#openid_open_url").click(function (e) {
+    e.preventDefault();

     $("#openid_url").val("http://");
     $("#login_auth_buttons").hide();
     $("#login_openid_url").show();
     $("#openid_url").val("http://");
     $("#login_auth_buttons").hide();
     $("#login_openid_url").show();


@@ -24,18 +25,4 @@ $(document).ready(function () {
   // Hide OpenID field for now
   $("#login_openid_url").hide();
   $("#login_openid_submit").hide();
   // Hide OpenID field for now
   $("#login_openid_url").hide();
   $("#login_openid_submit").hide();

-
-  // Handle OpenID submission by redirecting to omniauth
-  $("#openid_login_form").submit(function () {
-    var action = $(this).prop("action"),
-        openid_url = $(this).find("#openid_url").val(),
-        referer = $(this).find("#openid_referer").val(),
-        args = {};
-    args.openid_url = openid_url;
-    if (referer) {
-      args.referer = referer;
-    }
-    window.location = action + "?" + Qs.stringify(args);
-    return false;
-  });

 });
 });