Merge tag '2.2.1' into develop

Fixes "Cannot read property 'ok' of null" bug due to poor cleaning of user provided URLs
cancerit · Feb 25, 2019 · c7e95bc · c7e95bc
2 parents 192003c + 332a3b2
commit c7e95bc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 # Changes
 
+## 2.2.1
+
+* URL cleanup patterns corrected
+
 ## 2.2.0
 
 * Warn and change file permissions if password file has permissive access.

diff --git a/js/jbrowse_rasterize.js b/js/jbrowse_rasterize.js
@@ -144,12 +144,12 @@ function throwErr(message) {
 function urlCleaning(options, url, subdir) {
   // Handle standard cleaning of the URL
   let address = url
-    .replace(/loc=[^&]?/, '')
-    .replace(/&tracklist=[^&]?/, '')
-    .replace(/&nav=[^&]?/, '')
-    .replace(/&fullviewlink=[^&]?/, '')
-    .replace(/&highres=[^&]?/, '')
-    .replace(/&highlight=[^&]?/, '');
+    .replace(/loc=[^&]*/, '')
+    .replace(/&tracklist=[^&]*/, '')
+    .replace(/&nav=[^&]*/, '')
+    .replace(/&fullviewlink=[^&]*/, '')
+    .replace(/&highres=[^&]*/, '')
+    .replace(/&highlight=[^&]*/, '');
 
   // handle sometimes flaky 0.0.0.0 loopback
   address = address.replace(/[/]{2}0\.0\.0\.0/, '//localhost');

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cancerit/cgpjbrowsetoolkit",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "CLI tools for working with JBrowse",
   "directories": {
     "doc": "docs",