Merge pull request #137 from CBIIT/integration

Integration
CBIIT · Apr 2, 2020 · d3ab060 · d3ab060
2 parents dd70b7a + 7ec4672
commit d3ab060
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/LDlink/LDlink.css → LDlink/LDlink-4.0.3.css b/LDlink/LDlink.css → LDlink/LDlink-4.0.3.css
diff --git a/LDlink/LDlink-4.0.2.js → LDlink/LDlink-4.0.3.js b/LDlink/LDlink-4.0.2.js → LDlink/LDlink-4.0.3.js
@@ -39,7 +39,7 @@ $(document).ready(function() {
     });
 
     // Load news text from news.html to news-container div
-    $.get("news-4.0.2.html", function (data) {
+    $.get("news-4.0.3.html", function (data) {
         let tmpData = data.split("<p>")
         let i = 0;
         var newsHTMLList = [];
@@ -1477,7 +1477,7 @@ function populateHeaderValues(event, numFiles, label) {
 }
 
 function loadHelp() {
-    $('#help-tab').load('help-4.0.2.html');
+    $('#help-tab').load('help-4.0.3.html');
 }
 
 function calculate(e) {
@@ -3965,7 +3965,7 @@ function buildPopulationDropdown(elementId) {
     $('#' + elementId).multiselect({
         enableClickableOptGroups : true,
         buttonWidth : '180px',
-        maxHeight : 500,
+        maxHeight : 400,
         buttonClass : 'btn btn-default btn-ldlink-multiselect',
         includeSelectAllOption : true,
         dropRight : false,

diff --git a/LDlink/help-4.0.2.html → LDlink/help-4.0.3.html b/LDlink/help-4.0.2.html → LDlink/help-4.0.3.html
diff --git a/LDlink/index.html b/LDlink/index.html
@@ -23,7 +23,7 @@
 	<link rel="stylesheet" href="https://cdn.datatables.net/1.10.8/css/jquery.dataTables.min.css">
 	<link rel="stylesheet" href="/common/css/style.css">
 	<link rel="stylesheet" href="/common/css/social.css">
-	<link rel="stylesheet" href="LDlink.css">
+	<link rel="stylesheet" href="LDlink-4.0.3.css">
 </head>
 
 <!-- <body class="d-flex flex-column vh-100" role="document"> -->
@@ -2518,7 +2518,7 @@ <h4 class="modal-title">Modal title</h4>
 	<script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
 	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.1.0/knockout-min.js"></script>
 	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/knockout.mapping/2.4.1/knockout.mapping.min.js"></script>
-	<script type="text/javascript" src="LDlink-4.0.2.js"></script>
+	<script type="text/javascript" src="LDlink-4.0.3.js"></script>
 	<script type="text/javascript" src="/common/js/purify.js"></script>
 	<script type="text/javascript" src="/common/js/bootstrap-multiselect.js"></script>
 	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery-browser/0.0.7/jquery.browser.min.js"></script>

diff --git a/LDlink/news-4.0.2.html → LDlink/news-4.0.3.html b/LDlink/news-4.0.2.html → LDlink/news-4.0.3.html
@@ -1,3 +1,8 @@
+<p><b>LDlink 4.0.3 Release (04/06/2020)</b></p>
+<ul>
+    <li>Fix population dropdown UI cut short by module container.</li>
+</ul>
+<br>
 <p><b>LDlink 4.0.2 Release (03/20/2020)</b></p>
 <ul>
     <li>Fix P-value and 95% CI columns in LDtrait to reflect GWAS Catalog.</li>