X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e731dd71a77ad4ad1e9db22535e89444bb98e5d9..258964f5fa27b7dafe17850f91ce3c22862314d0:/app/assets/javascripts/login.js diff --git a/app/assets/javascripts/login.js b/app/assets/javascripts/login.js index 74b226bf6..43e2cf660 100644 --- a/app/assets/javascripts/login.js +++ b/app/assets/javascripts/login.js @@ -1,8 +1,6 @@ -//= querystring +//= qs/dist/qs $(document).ready(function () { - var querystring = require("querystring-component"); - // Preserve location hash in referer if (window.location.hash) { $("#referer").val($("#referer").val() + window.location.hash); @@ -10,13 +8,14 @@ $(document).ready(function () { // Attach referer to authentication buttons $(".auth_button").each(function () { - var params = querystring.parse(this.search.substring(1)); + var params = Qs.parse(this.search.substring(1)); params.referer = $("#referer").val(); - this.search = querystring.stringify(params); + this.search = Qs.stringify(params); }); // 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(); @@ -26,18 +25,4 @@ $(document).ready(function () { // 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 + "?" + querystring.stringify(args); - return false; - }); });