aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZachary Sloan2012-12-20 17:00:37 -0600
committerZachary Sloan2012-12-20 17:00:37 -0600
commitb4b057fc6df6bd5c6aad07490f1e5bad1e33e34f (patch)
tree79c5786e32be2accd239c2c5e05b354a4fa6e5e3
parentf3eb7f6403c2f0e48279ee02b0cd259b16775c94 (diff)
downloadgenenetwork2-b4b057fc6df6bd5c6aad07490f1e5bad1e33e34f.tar.gz
The control locus field in the interval mapping settings is now disabled if
"choose closest control" is set to "yes"
-rw-r--r--wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.coffee11
-rw-r--r--wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js7
-rw-r--r--wqflask/wqflask/templates/show_trait_mapping_tools.html10
3 files changed, 21 insertions, 7 deletions
diff --git a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.coffee b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.coffee
index 03048c5d..2cfc1c5b 100644
--- a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.coffee
+++ b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.coffee
@@ -7,10 +7,17 @@ $ ->
$("#marker_regression_btn").click(run_marker_regression)
-
+
composite_mapping_fields = ->
$(".composite_fields").toggle()
- $("#use_composite_choice").change(composite_mapping_fields) \ No newline at end of file
+ $("#use_composite_choice").change(composite_mapping_fields)
+
+
+
+ $("#choose_closet_control").change(->
+ elem = "#control_locus"
+ $(elem).prop("disabled", !$(elem).prop("disabled"))
+ ) \ No newline at end of file
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 20e379df..3923ebb7 100644
--- a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js
+++ b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js
@@ -14,7 +14,12 @@
composite_mapping_fields = function() {
return $(".composite_fields").toggle();
};
- return $("#use_composite_choice").change(composite_mapping_fields);
+ $("#use_composite_choice").change(composite_mapping_fields);
+ return $("#choose_closet_control").change(function() {
+ var elem;
+ elem = "#control_locus";
+ return $(elem).prop("disabled", !$(elem).prop("disabled"));
+ });
});
}).call(this);
diff --git a/wqflask/wqflask/templates/show_trait_mapping_tools.html b/wqflask/wqflask/templates/show_trait_mapping_tools.html
index 1119d619..bbca2400 100644
--- a/wqflask/wqflask/templates/show_trait_mapping_tools.html
+++ b/wqflask/wqflask/templates/show_trait_mapping_tools.html
@@ -74,17 +74,18 @@
</label>
</div>
</div>
- <div class="control-group composite_fields" style="display: none;">
+ <div class="control-group composite_fields" style="display: none;"
+ id="choose_closet_control">
<label class="control-label">Choose Closest Control</label>
<div class="controls">
<label class="radio inline">
<input type="radio" name="default_control_locus"
- id="default_control_locus" value="yes">
+ id="default_control_locus" value="yes" checked>
Yes
</label>
<label class="radio inline">
<input type="radio" name="default_control_locus"
- id="default_control_locus" value="no" checked>
+ id="default_control_locus" value="no">
No
</label>
</div>
@@ -93,7 +94,8 @@
<label for="mapping_bootstraps" class="control-label"
title="Bootstrapping Resamples">Control Locus</label>
<div class="controls">
- <input name="mapping_bootstraps" value="2000" type="text" />
+ <input name="control_locus" placeholder="rs12345" id="control_locus"
+ type="text" disabled />
</div>
</div>