Merge pull request #35 from nzzdev/release-1.3.0

Release 1.3.0
nzzdev · Oct 30, 2017 · 8972dc2 · 8972dc2
2 parents 3247a17 + eadb79a
commit 8972dc2
Show file tree

Hide file tree

Showing 10 changed files with 348 additions and 104 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-8.1
+8.8
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ services:
 - docker
 language: node_js
 node_js:
-- '8.1'
+- '8.8'
 install:
 - npm install -g jspm
 - npm install

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Use following version of Node as the base image
-FROM node:8.1
+FROM node:8.8
 
 # Set work directory for run/cmd
 WORKDIR /app

diff --git a/chart/chart.js b/chart/chart.js
@@ -277,38 +277,20 @@ export function getDivisorString(divisor) {
 }
 
 function getContextHtml(item, chartistConfig) {
-  let axisExplanation = {x: '', y: ''};
-  axisExplanation.y = getDivisorString(chartistConfig.yValueDivisor);
-
-  const labels = {
-    x: item.xAxisLabel,
-    y: item.yAxisLabel
-  }
-
   let html = getLegendHtml(item);
-  var axisNames = new Array('y', 'x');
-  if (chartistConfig.horizontalBars) {
-    axisNames.reverse();
-  }
 
-  html += `<div class="q-chart__label-y-axis s-font-note-s s-font-note-s--light">${labels[axisNames[0]] || ''}${axisExplanation[axisNames[0]]}</div>`;
 
-  if (item.data.x && item.dataSeriesType && item.dataSeriesType.id === 'date') {
-    if (chartistConfig.horizontalBars) {
-      html += `<div class="q-chart__label-x-axis s-font-note-s s-font-note-s--light">${labels[axisNames[1]] || ''}${axisExplanation[axisNames[1]]}</div>`;
+  let chartistContainerMarkup = '<div class="q-chart__chartist-container"></div>';
+
+  if (chartistConfig.horizontalBars) {
+    if (!item.options.hideAxisLabel) {
+      html += `<div class="q-chart__label-y-axis s-font-note-s s-font-note-s--light">${item.xAxisLabel || ''}</div>`;  
     }
-    html += '<div class="q-chart__chartist-container"></div>';
+    html += chartistContainerMarkup;
   } else {
-    if (chartistConfig.horizontalBars) {
-      html += `
-        <div class="q-chart__label-x-axis s-font-note-s s-font-note-s--light">${labels[axisNames[1]] || ''}${axisExplanation[axisNames[1]]}</div>
-        <div class="q-chart__chartist-container"></div>
-      `;
-    } else {
-      html += `
-        <div class="q-chart__chartist-container"></div>
-        <div class="q-chart__label-x-axis s-font-note-s s-font-note-s--light">${labels[axisNames[1]] || ''}${axisExplanation[axisNames[1]]}</div>
-      `;
+    html += chartistContainerMarkup;
+    if (!item.options.hideAxisLabel) {
+      html += `<div class="q-chart__label-x-axis s-font-note-s s-font-note-s--light">${item.xAxisLabel || ''}</div>`;
     }
   }
   html += '</div>';

diff --git a/index.html b/index.html
@@ -3,8 +3,9 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>Q Renderer Skeleton</title>
+    <title>Q Chart</title>
     <meta name="description" content="">
+    <link rel="stylesheet" href="https://context-service.st.nzz.ch/stylesheet/all/nzz.ch.css">
     <link rel="stylesheet" href="https://service.sophie.nzz.ch/bundle/sophie-q@^1,sophie-font@^1,sophie-color@^1,sophie-viz-color@^1[general].css">
     <script src="https://rawgit.com/filamentgroup/loadCSS/master/src/loadCSS.js"></script> 
   </head>
@@ -494,6 +495,7 @@
       "prognosisStart": null
     },
     "highlightDataSeries": 1,
+    "hideAxisLabel": false,
     "colorOverwrite": [
       {
         "color": "red",