Changed back previous 'fix' that was intended to fix issue where two tabs were opened when doing mapping/correlations; apparently this is a chrome specific problem so it will need to be deal twiht differently

3 files changed, 1 insertions, 3 deletions

diff --git a/wqflask/wqflask/static/new/javascript/get_covariates_from_collection.js b/wqflask/wqflask/static/new/javascript/get_covariates_from_collection.js
index 8cd6dac3..934cc14d 100644
--- a/wqflask/wqflask/static/new/javascript/get_covariates_from_collection.js
+++ b/wqflask/wqflask/static/new/javascript/get_covariates_from_collection.js
@@ -110,7 +110,7 @@ submit_click = function() {
 trait_click = function() {
   var dataset, this_trait_url, trait;
   trait = $(this).parent().find('.trait').text();
-  dataset = $(this).parent().find('.dataset').text();
+  dataset = $(this).parent().find('.dataset').data("dataset");
   $("input[name=covariates]").val(trait + ":" + dataset)
   $(".selected_covariates").text(trait)
   return $.colorbox.close();
diff --git a/wqflask/wqflask/static/new/javascript/show_trait.js b/wqflask/wqflask/static/new/javascript/show_trait.js
index 738cd536..c0784073 100644
--- a/wqflask/wqflask/static/new/javascript/show_trait.js
+++ b/wqflask/wqflask/static/new/javascript/show_trait.js
@@ -516,7 +516,6 @@ $('select[name=corr_type]').change(on_corr_method_change);
 submit_special = function(url) {
   $("#trait_data_form").attr("action", url);
   $("#trait_data_form").submit();
-  return false
 };
 
 var corr_input_list = ['corr_type', 'primary_samples', 'trait_id', 'dataset', 'group', 'tool_used', 'form_url', 'corr_sample_method', 'corr_samples_group', 'corr_dataset', 'min_expr',
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 db17af40..4dce0705 100644
--- a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js
+++ b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js
@@ -5,7 +5,6 @@
   submit_special = function(url) {
     $("#trait_data_form").attr("action", url);
     $("#trait_data_form").submit();
-    return false;
   };
 
   update_time_remaining = function(percent_complete) {