Do not rely on remote hosts preserving query string

eweitz · Apr 16, 2018 · a8237c2 · a8237c2
1 parent 5822260
commit a8237c2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/dist/js/ideogram.min.js b/dist/js/ideogram.min.js
diff --git a/dist/js/ideogram.min.js.map b/dist/js/ideogram.min.js.map
diff --git a/src/js/init.js b/src/js/init.js
@@ -428,17 +428,30 @@ function init() {
       ) {
 
         var bandDataUrl = ideo.config.dataDir + bandDataFileNames[taxid];
-        // Ensures correct taxid is processed in response callback; using
-        // simply 'taxid' variable gives the last *requested* taxid, which
-        // fails when dealing with multiple taxa.
-        bandDataUrl += '?taxid=' + taxid;
 
         fetch(bandDataUrl)
           .then(function(response) {
             return response.text().then(function(text) {
+
+              // Fetched data is a JavaScript variable, so assign it
               eval(text);
-              var taxid = response.url.split('taxid=')[1];
-              ideo.bandData[taxid] = chrBands;
+
+              // Ensures correct taxid is processed
+              // in response callback; using simply upstream 'taxid' variable
+              // gives the last *requested* taxid, which fails when dealing
+              // with multiple taxa.
+              var fetchedTaxid, tid, bandDataFileName;
+              for (tid in bandDataFileNames) {
+                bandDataFileName = bandDataFileNames[tid];
+                if (
+                  response.url.includes(bandDataFileName) &&
+                  bandDataFileName !== ''
+                ) {
+                  fetchedTaxid = tid;
+                }
+              }
+
+              ideo.bandData[fetchedTaxid] = chrBands;
               numBandDataResponses += 1;
 
               if (numBandDataResponses === taxids.length) {