Test font option

eweitz · May 8, 2021 · 24391a7 · 24391a7
1 parent ce1d29f
commit 24391a7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/examples/vanilla/related-genes.html b/examples/vanilla/related-genes.html
@@ -246,7 +246,7 @@ <h1>Related genes | Ideogram</h1>
       chrHeight: 100,
       chrLabelSize: 12,
       annotationHeight: 7,
-      fontFamily: "'Montserrat', sans-serif",
+      // fontFamily: "'Montserrat', sans-serif",
       onLoad: plotGeneFromUrl,
       onPlotRelatedGenes: reportRelatedGenes,
       showAnnotLabels: true,

diff --git a/src/js/kit/related-genes.js b/src/js/kit/related-genes.js
@@ -737,10 +737,8 @@ function decorateRelatedGene(annot) {
 
 const shape = 'triangle';
 
-let fontFamily;
-
 const legendHeaderStyle =
-  `font-size: 14px; font-weight: bold; font-color: #333; ${fontFamily}`;
+  `font-size: 14px; font-weight: bold; font-color: #333;`;
 const relatedLegend = [{
   name: `
     <div style="position: relative; left: -15px; padding-bottom: 10px;">
@@ -790,8 +788,6 @@ function _initRelatedGenes(config, annotsInList) {
     annotsInList = annotsInList.map(name => name.toLowerCase());
   }
 
-  fontFamily = (config.fontFamily) ? config.fontFamily : '';
-
   const kitDefaults = {
     showFullyBanded: false,
     rotatable: false,
@@ -887,8 +883,6 @@ function _initGeneHints(config, annotsInList) {
     annotsInList = annotsInList.map(name => name.toLowerCase());
   }
 
-  fontFamily = (config.fontFamily) ? config.fontFamily : '';
-
   const annotsPath =
     getDir('annotations/gene-cache/homo-sapiens-top-genes.tsv');
 

diff --git a/test/offline/core.test.js b/test/offline/core.test.js
@@ -783,5 +783,4 @@ describe('Ideogram', function() {
 
     var ideogram = new Ideogram(config);
   });
-
 });
diff --git a/test/online/related-genes.test.js b/test/online/related-genes.test.js
@@ -16,7 +16,12 @@ describe('Ideogram related genes kit', function() {
     d3.selectAll('div').remove();
   });
 
-  it('handles searched gene and annotation click', done => {
+  function getFontFamily(selector) {
+    const element = document.querySelector(selector);
+    return window.getComputedStyle(element).getPropertyValue('font-family');
+  }
+
+  it('handles searched gene, annotation click, and font', done => {
 
     async function callback() {
       await ideogram.plotRelatedGenes('RAD51');
@@ -45,7 +50,9 @@ describe('Ideogram related genes kit', function() {
     }
 
     function onPlotRelatedGenes() {
-      // pass through
+      const legendFontFamily = getFontFamily('#_ideogramLegend');
+      assert.equal(legendFontFamily, 'serif');
+      assert.equal(getFontFamily('.chrLabel'), 'serif');
     }
 
     function onWillShowAnnotTooltip(annot) {
@@ -65,7 +72,8 @@ describe('Ideogram related genes kit', function() {
       dataDir: '/dist/data/bands/native/',
       onClickAnnot,
       onPlotRelatedGenes,
-      onWillShowAnnotTooltip
+      onWillShowAnnotTooltip,
+      fontFamily: 'serif'
     };
 
     const ideogram = Ideogram.initRelatedGenes(config);