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

diff --git a/app/assets/javascripts/login.js b/app/assets/javascripts/login.js
index 5853193bcf7c1695335c34d831070b910f306061..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
-  $("#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();