diff options
3 files changed, 15 insertions, 3 deletions
diff --git a/wqflask/wqflask/static/new/javascript/show_trait.js b/wqflask/wqflask/static/new/javascript/show_trait.js index 1dd54e3a..8d5982b7 100755 --- a/wqflask/wqflask/static/new/javascript/show_trait.js +++ b/wqflask/wqflask/static/new/javascript/show_trait.js @@ -310,6 +310,20 @@ } }; $('select[name=corr_method]').change(on_corr_method_change); + + submit_special = function(url) { + $("#trait_data_form").attr("action", url); + return $("#trait_data_form").submit(); + }; + + $(".corr_compute").on("click", (function(_this) { + return function() { + var url; + url = "/corr_compute"; + return submit_special(url); + }; + })(this)); + create_value_dropdown = function(value) { return "<option val=" + value + ">" + value + "</option>"; }; diff --git a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js index 3637233e..68744aa9 100755 --- a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js +++ b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js @@ -3,11 +3,9 @@ var block_outliers, composite_mapping_fields, do_ajax_post, get_progress, mapping_method_fields, open_mapping_results, outlier_text, showalert, submit_special, toggle_enable_disable, update_time_remaining; submit_special = function(url) { - //var url; console.log("In submit_special"); console.log("this is:", this); console.log("$(this) is:", $(this)); - //url = $(this).data("url"); console.log("url is:", url); $("#trait_data_form").attr("action", url); return $("#trait_data_form").submit(); diff --git a/wqflask/wqflask/templates/show_trait_calculate_correlations.html b/wqflask/wqflask/templates/show_trait_calculate_correlations.html index a7edbc48..ed58b32c 100755 --- a/wqflask/wqflask/templates/show_trait_calculate_correlations.html +++ b/wqflask/wqflask/templates/show_trait_calculate_correlations.html @@ -102,7 +102,7 @@ <div class="form-group"> <label for="corr_sample_method" class="col-xs-1 control-label"></label> <div class="col-xs-4 controls"> - <button class="btn submit_special btn-primary" data-url="/corr_compute" title="Compute Correlation"> + <button class="btn corr_compute submit_special btn-primary" data-url="/corr_compute" title="Compute Correlation"> <i class="icon-ok-circle icon-white"></i> Compute </button> </div> |