Merge c48fd2b into d6d034f

keller-mark · Aug 17, 2020 · d2a7d3e · d2a7d3e
2 parents d6d034f + c48fd2b
commit d2a7d3e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/helpers.js b/src/helpers.js
@@ -123,10 +123,10 @@ export const svgToUri = (svg) => {
     var source = serializer.serializeToString(svg);
 
     // Add namespace.
-    if(!source.match(/^<svg[^>]+xmlns="http\:\/\/www\.w3\.org\/2000\/svg"/)){
+    if(!source.match(/^<svg[^>]+xmlns="http:\/\/www\.w3\.org\/2000\/svg"/)){
         source = source.replace(/^<svg/, '<svg xmlns="http://www.w3.org/2000/svg"');
     }
-    if(!source.match(/^<svg[^>]+"http\:\/\/www\.w3\.org\/1999\/xlink"/)){
+    if(!source.match(/^<svg[^>]+"http:\/\/www\.w3\.org\/1999\/xlink"/)){
         source = source.replace(/^<svg/, '<svg xmlns:xlink="http://www.w3.org/1999/xlink"');
     }
 

diff --git a/src/scales/AbstractScale.js b/src/scales/AbstractScale.js
@@ -15,6 +15,7 @@ import {
     interpolateOranges as d3_interpolateOranges,
     interpolatePurples as d3_interpolatePurples,
     interpolateReds as d3_interpolateReds,
+    interpolateTurbo as d3_interpolateTurbo,
     interpolateViridis as d3_interpolateViridis,
     interpolateInferno as d3_interpolateInferno,
     interpolateMagma as d3_interpolateMagma,
@@ -65,6 +66,7 @@ export default class AbstractScale extends AbstractScaleDispatcher {
         "Oranges": d3_interpolateOranges,
         "Purples": d3_interpolatePurples,
         "Reds": d3_interpolateReds,
+        "Turbo": d3_interpolateTurbo,
         "Viridis": d3_interpolateViridis,
         "Inferno": d3_interpolateInferno,
         "Magma": d3_interpolateMagma,
@@ -281,4 +283,4 @@ export default class AbstractScale extends AbstractScaleDispatcher {
         this.setDomainFiltered(this._domain.slice());
     }
 
-}
+}