Avoided leading ?& GET parameters. (#59)

silentsokolov · Feb 22, 2021 · 1799f78 · 1799f78
1 parent a0aea31
commit 1799f78
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/rangefilter/static/rangefilter/iife.js b/rangefilter/static/rangefilter/iife.js
@@ -12,7 +12,8 @@
         function(event){
           event.preventDefault();
           var form_data = django.jQuery('#'+form_name).serialize();
-          window.location = window.location.pathname + query_string + '&' + form_data;
+          amp = query_string == "?" ? "" : "&";  // avoid leading ?& combination
+          window.location = window.location.pathname + query_string + amp + form_data;
       });
 
       // Bind reset buttons

diff --git a/rangefilter/templates/rangefilter/date_filter.html b/rangefilter/templates/rangefilter/date_filter.html
@@ -72,7 +72,8 @@ <h3>{{ title }}</h3>
         event.preventDefault();
         var query_string = django.jQuery('input#'+qs_name).val();
         var form_data = django.jQuery('#'+form_name).serialize();
-        window.location = window.location.pathname + query_string + '&' + form_data;
+        amp = query_string == "?" ? "" : "&";  // avoid leading ?& combination
+        window.location = window.location.pathname + query_string + amp + form_data;
     }
     function datefilter_reset(qs_name){
         var query_string = django.jQuery('input#'+qs_name).val();

diff --git a/rangefilter/templates/rangefilter/date_filter_1_8.html b/rangefilter/templates/rangefilter/date_filter_1_8.html
@@ -60,8 +60,8 @@ <h3>{{ title }}</h3>
     function datefilter_apply(event, qs_name, form_name){
         event.preventDefault();
         var query_string = django.jQuery('input#'+qs_name).val();
-        var form_data = django.jQuery('#'+form_name).serialize();
-        window.location = window.location.pathname + query_string + '&' + form_data;
+        amp = query_string == "?" ? "" : "&";  // avoid leading ?& combination
+        window.location = window.location.pathname + query_string + amp + form_data;
     }
     function datefilter_reset(qs_name){
         var query_string = django.jQuery('input#'+qs_name).val();