new filter results

static/client/js/scripts.js

@@ -81,7 +81,7 @@ $(document).ready(function () {
 
         $.ajax({
             url: $link.attr('href'),
-            data: search_string,
+            data: search_string
         })
         .done(function(data) {
             if (data.success) {
@@ -92,6 +92,8 @@ $(document).ready(function () {
 
     });
 
+    $('#get_filters').trigger('click');
+
     $('.page-body').on('click', '.ajax-paginator a:not(.disabled)', function(e) {
         e.preventDefault();
         var $link = $(this),
@@ -102,7 +104,7 @@ $(document).ready(function () {
         $('html, body').animate({scrollTop: $('.page-body').offset().top - 50}, 500);
 
         $.ajax({
-            url: $link.attr('href'),
+            url: $link.attr('href')
         })
         .done(function(data) {
             if (data.success) {
@@ -212,20 +214,40 @@ $(document).ready(function () {
         event.preventDefault();
         var $form = $('.filter_form'),
             params = $form.serialize(),
-            $loader = $('#wait-ajax');
+            filters_url = $form.data('formurl'),
+            results_url = $form.data('resultsurl'),
+            $loader = $('#wait-ajax'),
+            form_done = false,
+            results_done = false;
+
 
         $loader.show();
 
         $('html, body').animate({scrollTop: $('.page-body').offset().top - 50}, 500);
 
-        $.getJSON($form.attr('action'), params, function(data) {
+        $.getJSON(results_url, params, function(data) {
             if (data.success) {
+                results_done = true;
                 $('.page-body').html(data.results);
+
+                if (results_done && form_done){
+                    $loader.hide();
+                }
+            }
+        });
+
+        $.getJSON(filters_url, params, function (data) {
+            if (data.success){
+                form_done = true;
+
                 $('#filter_form_wraper').html(data.form);
                 set_filter_block_height();
-                $loader.hide();
+
+                if (results_done && form_done){
+                    $loader.hide();
+                }
             }
-        });
+        })
     });
 
 

static/client/js/vendor.js

@@ -4998,7 +4998,7 @@ $(document).ready(function () {
 
         $.ajax({
             url: $link.attr('href'),
-            data: search_string,
+            data: search_string
         })
         .done(function(data) {
             if (data.success) {
@@ -5009,6 +5009,8 @@ $(document).ready(function () {
 
     });
 
+    $('#get_filters').trigger('click');
+
     $('.page-body').on('click', '.ajax-paginator a:not(.disabled)', function(e) {
         e.preventDefault();
         var $link = $(this),
@@ -5019,7 +5021,7 @@ $(document).ready(function () {
         $('html, body').animate({scrollTop: $('.page-body').offset().top - 50}, 500);
 
         $.ajax({
-            url: $link.attr('href'),
+            url: $link.attr('href')
         })
         .done(function(data) {
             if (data.success) {
@@ -5129,20 +5131,40 @@ $(document).ready(function () {
         event.preventDefault();
         var $form = $('.filter_form'),
             params = $form.serialize(),
-            $loader = $('#wait-ajax');
+            filters_url = $form.data('formurl'),
+            results_url = $form.data('resultsurl'),
+            $loader = $('#wait-ajax'),
+            form_done = false,
+            results_done = false;
+
 
         $loader.show();
 
         $('html, body').animate({scrollTop: $('.page-body').offset().top - 50}, 500);
 
-        $.getJSON($form.attr('action'), params, function(data) {
+        $.getJSON(results_url, params, function(data) {
             if (data.success) {
+                results_done = true;
                 $('.page-body').html(data.results);
+
+                if (results_done && form_done){
+                    $loader.hide();
+                }
+            }
+        });
+
+        $.getJSON(filters_url, params, function (data) {
+            if (data.success){
+                form_done = true;
+
                 $('#filter_form_wraper').html(data.form);
                 set_filter_block_height();
-                $loader.hide();
+
+                if (results_done && form_done){
+                    $loader.hide();
+                }
             }
-        });
+        })
     });