Merge remote-tracking branch 'origin/master' into kevinlul/reproducibility

kevinlul · kevinlul · commit 99f1e2283d07 · 2021-12-15T11:41:42.000-05:00
diff --git a/src/primer-design/web/js/manualPrimerEntry.js b/src/primer-design/web/js/manualPrimerEntry.js
@@ -1,13 +1,13 @@
-var geneName = getUrlVars()['gene'];
-var ENSID = getUrlVars()['ensid'];
-var GENOME = getUrlVars()['org'];
+var params = new URLSearchParams(location.search);
+var geneName = params.get('gene');
+var ENSID = params.get('ensid');
+var GENOME = params.get('org');
 var RELEASE = function (){
-	//TODO: get the genome here! (hardcoding for mm10 atm)
         var tempRelease = null;
         $.ajax({
                 'type' : "POST",
                 'dataType' : "html",
-		'data' : {genome: 'mm10'},
+		'data' : { genome: GENOME },
                 'async' : false,
                 'url' : "./ajaxCalls/fetchRelease.py",
                 success : function (html) {
@@ -19,15 +19,6 @@ var RELEASE = function (){
 
 document.title = geneName + " Manual Primer Entry";
 
-// thank you anonymous author at html-online.com/articles/get-url-parameters-javascript/
-function getUrlVars() {
-    var vars = {};
-    var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m,key,value) {
-        vars[key] = value;
-    });
-    return vars;
-}
-
 function populateOnLoad(){
 	$('#page-title').html("Manually Enter Primer Pair for " + geneName);
 }
diff --git a/src/primer-design/web/manualPrimerEntry.html b/src/primer-design/web/manualPrimerEntry.html
@@ -4,12 +4,12 @@
                 <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
                 <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
                <!-- <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.2/js/bootstrap.min.js" integrity="sha384-o+RDsa0aLu++PJvFqy8fFScvbHFLtbvScb8AjopnFD+iEQ7wo/CG0xlczd+2O/em" crossorigin="anonymous"></script> -->
-		<script src="bootstrap-4.1.3/dist/js/bootstrap.min.js"></script>
-                <script src="./web/js/manualPrimerEntry.js"></script>
+		<script src="../../../docs/bin/bootstrap-4.4.1-dist/js/bootstrap.min.js"></script>
+                <script src="./js/manualPrimerEntry.js"></script>
                 <!-- <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.2/css/bootstrap.min.css" integrity="sha384-Smlep5jCw/wG7hdkwQ/Z5nLIefveQRIY9nfy6xoR1uRYBtpZgI6339F5dgvm/e9B" crossorigin="anonymous"> -->
-		 <link rel="stylesheet" href="bootstrap-4.1.3/dist/css/bootstrap.min.css">
+		 <link rel="stylesheet" href="../../../docs/bin/bootstrap-4.4.1-dist/css/bootstrap.min.css">
                 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-                <link rel="stylesheet" type="text/css" href="./web/css/manualPrimerEntry.css">
+                <link rel="stylesheet" type="text/css" href="./css/manualPrimerEntry.css">
 </head>
 <body onload="populateOnLoad()">
 	<h3 id="page-title"></h3>
