Merge branch 'release/23.1.0'

CenterForOpenScience · Apr 17, 2023 · b61d621 · b61d621
2 parents b9b3a66 + b5a9734
commit b61d621
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,10 @@
 ChangeLog
 *********
 
+23.1.0 (2023-04-17)
+===================
+- Fix: Improve support for special characters in tabular renderer sheet names.  (thanks, @aaxelb!)
+
 23.0.0 (2023-03-30)
 ===================
 - Docs: Basic repository maintenance for 2023; update copyright dates and update COS jobs url.

diff --git a/mfr/extensions/tabular/templates/viewer.mako b/mfr/extensions/tabular/templates/viewer.mako
@@ -33,11 +33,12 @@
 
         for (var sheetName in sheets){
             var sheet = sheets[sheetName];
-            sheetName = sheetName.replace( /(:|\.|\[|\]|,|@|&|\ )/g, '_' ); //Handle characters that can't be in DOM ID's
-            $("#tabular-tabs").append('<li role="presentation" style="display:inline-block; float: none;"><a id="' + sheetName + '" aria-controls="' + sheetName + '" role="tab" data-toggle="tab">'+ sheetName + '</a></li>');
-            gridArr[sheetName] = [sheet[0], sheet[1]];
+            // Handle characters that can't be in DOM ID's
+            var sheetCoded = window.btoa(encodeURIComponent(sheetName)).replace(/=/g, '');
+            $("#tabular-tabs").append('<li role="presentation" style="display:inline-block; float: none;"><a id="' + sheetCoded + '" aria-controls="' + sheetCoded + '" role="tab" data-toggle="tab">'+ sheetName + '</a></li>');
+            gridArr[sheetCoded] = [sheet[0], sheet[1]];
 
-            $('#'+sheetName).click(function (e) {
+            $('#'+sheetCoded).click(function (e) {
                 e.preventDefault();
                 var columns = gridArr[$(this).attr('id')][0];
                 var rows = gridArr[$(this).attr('id')][1];

diff --git a/mfr/version.py b/mfr/version.py
@@ -1 +1 @@
-__version__ = '23.0.0'
+__version__ = '23.1.0'