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

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

diff --git a/app/assets/javascripts/login.js b/app/assets/javascripts/login.js
index 3496587b49848cadbd8d7f96c40cf70db970f905..8963c07b64c28ccd66cc13d2677ba5fbae2b6362 100644 (file)
--- a/app/assets/javascripts/login.js
+++ b/app/assets/javascripts/login.js
@@ -1,4 +1,6 @@
-$(document).ready(function() {
+//= qs/dist/qs
+
+$(document).ready(function () {

   // Preserve location hash in referer
   if (window.location.hash) {
     $("#referer").val($("#referer").val() + window.location.hash);
   // Preserve location hash in referer
   if (window.location.hash) {
     $("#referer").val($("#referer").val() + window.location.hash);


@@ -6,13 +8,13 @@ $(document).ready(function() {
 
   // Attach referer to authentication buttons
   $(".auth_button").each(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();
     params.referer = $("#referer").val();

-    this.search = querystring.stringify(params);
+    this.search = Qs.stringify(params);

   });
 
   // Add click handler to show OpenID field
   });
 
   // Add click handler to show OpenID field

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

     $("#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,7 +26,7 @@ $(document).ready(function() {
   $("#login_openid_submit").hide();
 
   // Handle OpenID submission by redirecting to omniauth
   $("#login_openid_submit").hide();
 
   // Handle OpenID submission by redirecting to omniauth

-  $("#openid_login_form").submit(function() {
+  $("#openid_login_form").submit(function () {

     var action = $(this).prop("action"),
         openid_url = $(this).find("#openid_url").val(),
         referer = $(this).find("#openid_referer").val(),
     var action = $(this).prop("action"),
         openid_url = $(this).find("#openid_url").val(),
         referer = $(this).find("#openid_referer").val(),


@@ -33,7 +35,7 @@ $(document).ready(function() {
     if (referer) {
       args.referer = referer;
     }
     if (referer) {
       args.referer = referer;
     }

-    window.location = action + "?" + querystring.stringify(args);
+    window.location = action + "?" + Qs.stringify(args);

     return false;
   });
 });
     return false;
   });
 });