Merge pull request #124 from CBIIT/integration

Integration
CBIIT · Mar 9, 2020 · 55919eb · 55919eb
2 parents 021a7d7 + 2d7ba51
commit 55919eb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/LDlink/LDlink.js b/LDlink/LDlink.js
@@ -4552,7 +4552,9 @@ window.addEventListener('resize', function() {
 });
 
 window.addEventListener('popstate', function(e) {
-    this.location.reload();
+    if (e.state) {
+        this.location.reload();
+    }
 });
 
 function clearTabs(currentTab){

diff --git a/LDlink/index.html b/LDlink/index.html
@@ -468,9 +468,9 @@ <h2 class="text-center">LDassoc Tool</h2>
 												<button class="btn btn-default dropdown-toggle" type="button" id="region-codes-menu1" data-toggle="dropdown"
 												 style="width:155px;">Select Region<span class="caret"></span></button>
 												<ul class="dropdown-menu pull-left" role="menu" aria-labelledby="menu1">
-													<li role="presentation"><a role="menuitem" tabindex="-1">Gene</a></li>
-													<li role="presentation"><a role="menuitem" tabindex="-1">Region</a></li>
-													<li role="presentation"><a role="menuitem" tabindex="-1">Variant</a></li>
+													<li role="presentation"><a role="menuitem" tabindex="-1" href="#">Gene</a></li>
+													<li role="presentation"><a role="menuitem" tabindex="-1" href="#">Region</a></li>
+													<li role="presentation"><a role="menuitem" tabindex="-1" href="#">Variant</a></li>
 												</ul>
 											</div>
 											<!-- region = Gene -->