revised code with new mock

plotly · Jan 3, 2019 · 707c017 · 707c017
1 parent 912e554
commit 707c017
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 11 deletions.
diff --git a/src/components/colorbar/connect.js b/src/components/colorbar/connect.js
@@ -41,12 +41,10 @@ module.exports = function connectColorbar(gd, cd, moduleOpts) {
 
     var trace = cd[0].trace;
     var cbId = 'cb' + trace.uid;
-    var containerNames = (moduleOpts.container) ?
-        moduleOpts.container.split(' | ') :
-        [moduleOpts.container];
+    moduleOpts = Array.isArray(moduleOpts) ? moduleOpts : [moduleOpts];
 
-    for(var i = 0; i < containerNames.length; i++) {
-        var containerName = containerNames[i];
+    for(var i = 0; i < moduleOpts.length; i++) {
+        var containerName = moduleOpts[i].container;
 
         var container = containerName ? trace[containerName] : trace;
 
@@ -60,7 +58,7 @@ module.exports = function connectColorbar(gd, cd, moduleOpts) {
             container.colorscale;
 
         cb.fillgradient(scl)
-            .zrange([container[moduleOpts.min], container[moduleOpts.max]])
+            .zrange([container[moduleOpts[i].min], container[moduleOpts[i].max]])
             .options(container.colorbar)();
 
         return;

diff --git a/src/traces/scatter3d/index.js b/src/traces/scatter3d/index.js
@@ -14,11 +14,17 @@ Scatter3D.plot = require('./convert');
 Scatter3D.attributes = require('./attributes');
 Scatter3D.markerSymbols = require('../../constants/gl3d_markers');
 Scatter3D.supplyDefaults = require('./defaults');
-Scatter3D.colorbar = {
-    container: 'marker | line',
-    min: 'cmin',
-    max: 'cmax'
-};
+Scatter3D.colorbar = [
+    {
+        container: 'marker',
+        min: 'cmin',
+        max: 'cmax'
+    }, {
+        container: 'line',
+        min: 'cmin',
+        max: 'cmax'
+    }
+];
 Scatter3D.calc = require('./calc');
 
 Scatter3D.moduleType = 'trace';

diff --git a/test/image/mocks/gl3d_scatter3d-line-or-marker-colorscale.json b/test/image/mocks/gl3d_scatter3d-line-or-marker-colorscale.json
@@ -0,0 +1,21 @@
+{
+    "data": [
+        {
+            "x": [1, 2, 4, 8, 16],
+            "y": [-1, -2, -4, -8, -16],
+            "z": [0, 1, 0, 1, 0],
+            "type": "scatter3d",
+            "mode": "lines",
+            "line": {
+                "color": [0, 0.25, 0.5, 0.75, 1.0],
+                "showscale": true,
+                "width": 10
+            }
+        }
+    ],
+    "layout": {
+        "title": "Scatter3d show scale with line colors",
+        "width": 600,
+        "height": 600
+    }
+}