Make search actions retain their q values.

[quix0rs-gnu-social.git] / js / util.js

diff --git a/js/util.js b/js/util.js
index 6fe4770756a9601c30302f72ec4429914938d975..de486cf7405b2be54349e3ec0096274ae1b2e3ac 100644 (file)
--- a/js/util.js
+++ b/js/util.js
@@ -24,7 +24,7 @@ $(document).ready(function(){
                var remaining = maxLength - currentLength;
                var counter = $("#notice_text-count");
                counter.text(remaining);
-               
+
                if (remaining <= 0) {
                        $("#form_notice").addClass("warning");
                } else {
@@ -45,10 +45,10 @@ $(document).ready(function(){
        if ($("#notice_data-text").length) {
                $("#notice_data-text").bind("keyup", counter);
                $("#notice_data-text").bind("keydown", submitonreturn);
-               
+
                // run once in case there's something in there
                counter();
-               
+
                // set the focus
                $("#notice_data-text").focus();
        }
@@ -73,6 +73,24 @@ $(document).ready(function(){
                                                                                          }
                                         };
 
+       var joinoptions = { dataType: 'xml',
+                                          success: function(xml) { var new_form = document._importNode($('form', xml).get(0), true);
+                                                                                               var leave = new_form.id;
+                                                                                               var join = leave.replace('leave', 'join');
+                                                                                               $('form#'+join).replaceWith(new_form);
+                                                                                               $('form#'+leave).ajaxForm(leaveoptions).each(addAjaxHidden);
+                                                                                         }
+                                        };
+
+       var leaveoptions = { dataType: 'xml',
+                                          success: function(xml) { var new_form = document._importNode($('form', xml).get(0), true);
+                                                                                               var join = new_form.id;
+                                                                                               var leave = join.replace('join', 'leave');
+                                                                                               $('form#'+leave).replaceWith(new_form);
+                                                                                               $('form#'+join).ajaxForm(joinoptions).each(addAjaxHidden);
+                                                                                         }
+                                        };
+
        function addAjaxHidden() {
                var ajax = document.createElement('input');
                ajax.setAttribute('type', 'hidden');
@@ -81,25 +99,29 @@ $(document).ready(function(){
                this.appendChild(ajax);
        }
 
-       $("form.favor").ajaxForm(favoptions);
-       $("form.disfavor").ajaxForm(disoptions);
-       $("form.favor").each(addAjaxHidden);
-       $("form.disfavor").each(addAjaxHidden);
-
-       $("#nudge").ajaxForm ({ dataType: 'xml',
-                                                       beforeSubmit: function(xml) { $("form#nudge input[type=submit]").attr("disabled", "disabled");
-                                                                                                                 $("form#nudge input[type=submit]").addClass("disabled");
-                                                                                                               },
-                                                       success: function(xml) { $("#nudge").replaceWith(document._importNode($("#nudge_response", xml).get(0),true)); 
-                                                                                                    $("#nudge input[type=submit]").removeAttr("disabled");
-                                                                                                    $("#nudge input[type=submit]").removeClass("disabled");
-                                                                                                  }
-                                                });
-       $("#nudge").each(addAjaxHidden);
+       $("form.form_favor").ajaxForm(favoptions);
+       $("form.form_disfavor").ajaxForm(disoptions);
+       $("form.form_group_join").ajaxForm(joinoptions);
+       $("form.form_group_leave").ajaxForm(leaveoptions);
+       $("form.form_favor").each(addAjaxHidden);
+       $("form.form_disfavor").each(addAjaxHidden);
+       $("form.form_group_join").each(addAjaxHidden);
+       $("form.form_group_leave").each(addAjaxHidden);
+
+       $("#form_user_nudge").ajaxForm ({ dataType: 'xml',
+               beforeSubmit: function(xml) { $("#form_user_nudge input[type=submit]").attr("disabled", "disabled");
+                                                                         $("#form_user_nudge input[type=submit]").addClass("disabled");
+                                                                       },
+               success: function(xml) { $("#form_user_nudge").replaceWith(document._importNode($("#nudge_response", xml).get(0),true));
+                                                            $("#form_user_nudge input[type=submit]").removeAttr("disabled");
+                                                            $("#form_user_nudge input[type=submit]").removeClass("disabled");
+                                                          }
+        });
+       $("#form_user_nudge").each(addAjaxHidden);
 
        var Subscribe = { dataType: 'xml',
-                                         beforeSubmit: function(formData, jqForm, options) { $("form.subscribe input[type=submit]").attr("disabled", "disabled");
-                                                                                                                                             $("form.subscribe input[type=submit]").addClass("disabled");
+                                         beforeSubmit: function(formData, jqForm, options) { $(".form_user_subscribe input[type=submit]").attr("disabled", "disabled");
+                                                                                                                                             $(".form_user_subscribe input[type=submit]").addClass("disabled");
                                                                                                                                            },
                                          success: function(xml) { var form_unsubscribe = document._importNode($('form', xml).get(0), true);
                                                                                           var form_unsubscribe_id = form_unsubscribe.id;
@@ -107,14 +129,14 @@ $(document).ready(function(){
                                                                                           $("form#"+form_subscribe_id).replaceWith(form_unsubscribe);
                                                                                           $("form#"+form_unsubscribe_id).ajaxForm(UnSubscribe).each(addAjaxHidden);
                                                                                           $("dd.subscribers").text(parseInt($("dd.subscribers").text())+1);
-                                                                                          $("form.subscribe input[type=submit]").removeAttr("disabled");
-                                                                                          $("form.subscribe input[type=submit]").removeClass("disabled");
+                                                                                          $(".form_user_subscribe input[type=submit]").removeAttr("disabled");
+                                                                                          $(".form_user_subscribe input[type=submit]").removeClass("disabled");
                                                                                     }
                                        };
 
        var UnSubscribe = { dataType: 'xml',
-                                               beforeSubmit: function(formData, jqForm, options) { $("form.unsubscribe input[type=submit]").attr("disabled", "disabled");
-                                                                                                                                                   $("form.unsubscribe input[type=submit]").addClass("disabled");
+                                               beforeSubmit: function(formData, jqForm, options) { $(".form_user_unsubscribe input[type=submit]").attr("disabled", "disabled");
+                                                                                                                                                   $(".form_user_unsubscribe input[type=submit]").addClass("disabled");
                                                                                                                                                  },
                                            success: function(xml) { var form_subscribe = document._importNode($('form', xml).get(0), true);
                                                                                                 var form_subscribe_id = form_subscribe.id;
@@ -124,16 +146,15 @@ $(document).ready(function(){
                                                                                                 $("#profile_send_a_new_message").remove();
                                                                                                 $("#profile_nudge").remove();
                                                                                             $("dd.subscribers").text(parseInt($("dd.subscribers").text())-1);
-                                                                                                $("form.unsubscribe input[type=submit]").removeAttr("disabled");
-                                                                                                $("form.unsubscribe input[type=submit]").removeClass("disabled");
+                                                                                                $(".form_user_unsubscribe input[type=submit]").removeAttr("disabled");
+                                                                                                $(".form_user_unsubscribe input[type=submit]").removeClass("disabled");
                                                                                           }
                                          };
 
-       $("form.subscribe").ajaxForm(Subscribe);
-       $("form.unsubscribe").ajaxForm(UnSubscribe);
-       $("form.subscribe").each(addAjaxHidden);
-       $("form.unsubscribe").each(addAjaxHidden);
-
+       $(".form_user_subscribe").ajaxForm(Subscribe);
+       $(".form_user_unsubscribe").ajaxForm(UnSubscribe);
+       $(".form_user_subscribe").each(addAjaxHidden);
+       $(".form_user_unsubscribe").each(addAjaxHidden);
 
        var PostNotice = { dataType: 'xml',
                                           beforeSubmit: function(formData, jqForm, options) { if ($("#notice_data-text").get(0).value.length == 0) {
@@ -163,10 +184,10 @@ $(document).ready(function(){
        $("#form_notice").ajaxForm(PostNotice);
        $("#form_notice").each(addAjaxHidden);
 
-    $(".notice").hover(
+    $("#content .notice").hover(
         function () {
             $(this).addClass('hover');
-        }, 
+        },
         function () {
             $(this).removeClass('hover');
         }