mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'stage5' of bitbucket.org:Bonus_05/expomap into stage5

Browse Source
remotes/origin/stage5
Alexander Burdeiny 10 years ago
parent a68d6c03f8 dd9c00614f
commit a8a30d529f
3 changed files with 25 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      static/client/js/scripts.js
  2. 23
      static/client/js/vendor.js
  3. 2
      static/client/js_min/vendor.min.js

23
static/client/js/scripts.js
Unescape View File

@ -216,9 +216,9 @@ $(document).ready(function () {
params = $form.serialize(), params = $form.serialize(),
filters_url = $form.data('formurl'), filters_url = $form.data('formurl'),
results_url = $form.data('resultsurl'), results_url = $form.data('resultsurl'),
$loader = $('#wait-ajax'), $loader = $('#wait-ajax');
form_done = false, // form_done = false,
results_done = false; // results_done = false;
$loader.show(); $loader.show();
@ -227,25 +227,26 @@ $(document).ready(function () {
$.getJSON(results_url, params, function(data) { $.getJSON(results_url, params, function(data) {
if (data.success) { if (data.success) {
results_done = true; //results_done = true;
$('.page-body').html(data.results); $('.page-body').html(data.results);
if (results_done && form_done){ // if (results_done && form_done){
$loader.hide(); // $loader.hide();
} // }
$loader.hide();
} }
}); });
$.getJSON(filters_url, params, function (data) { $.getJSON(filters_url, params, function (data) {
if (data.success){ if (data.success){
form_done = true; //form_done = true;
$('#filter_form_wraper').html(data.form); $('#filter_form_wraper').html(data.form);
set_filter_block_height(); set_filter_block_height();
if (results_done && form_done){ // if (results_done && form_done){
$loader.hide(); // $loader.hide();
} // }
} }
}) })
}); });

23
static/client/js/vendor.js
Unescape View File

@ -5133,9 +5133,9 @@ $(document).ready(function () {
params = $form.serialize(), params = $form.serialize(),
filters_url = $form.data('formurl'), filters_url = $form.data('formurl'),
results_url = $form.data('resultsurl'), results_url = $form.data('resultsurl'),
$loader = $('#wait-ajax'), $loader = $('#wait-ajax');
form_done = false, // form_done = false,
results_done = false; // results_done = false;
$loader.show(); $loader.show();
@ -5144,25 +5144,26 @@ $(document).ready(function () {
$.getJSON(results_url, params, function(data) { $.getJSON(results_url, params, function(data) {
if (data.success) { if (data.success) {
results_done = true; //results_done = true;
$('.page-body').html(data.results); $('.page-body').html(data.results);
if (results_done && form_done){ // if (results_done && form_done){
$loader.hide(); // $loader.hide();
} // }
$loader.hide();
} }
}); });
$.getJSON(filters_url, params, function (data) { $.getJSON(filters_url, params, function (data) {
if (data.success){ if (data.success){
form_done = true; //form_done = true;
$('#filter_form_wraper').html(data.form); $('#filter_form_wraper').html(data.form);
set_filter_block_height(); set_filter_block_height();
if (results_done && form_done){ // if (results_done && form_done){
$loader.hide(); // $loader.hide();
} // }
} }
}) })
}); });

2
static/client/js_min/vendor.min.js vendored
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save