🌴 *-regl2d init / reinit when no-webgl

Author: etpinard

src/traces/scattergl/index.js

@@ -166,7 +166,7 @@ function sceneUpdate(gd, subplot) {
     var scene = subplot._scene;
     var fullLayout = gd._fullLayout;
 
-    var reset = {
+    var resetOpts = {
         // number of traces in subplot, since scene:subplot → 1:1
         count: 0,
         // whether scene requires init hook in plot call (dirty plot call)
@@ -181,7 +181,7 @@ function sceneUpdate(gd, subplot) {
         errorYOptions: []
     };
 
-    var first = {
+    var initOpts = {
         selectBatch: null,
         unselectBatch: null,
         // regl- component stubs, initialized in dirty plot call
@@ -193,7 +193,11 @@ function sceneUpdate(gd, subplot) {
     };
 
     if(!subplot._scene) {
-        scene = subplot._scene = Lib.extendFlat({}, reset, first);
+        scene = subplot._scene = {};
+
+        scene.init = function init() {
+            Lib.extendFlat(scene, initOpts, resetOpts);
+        };
 
         // apply new option to all regl components (used on drag)
         scene.update = function update(opt) {
@@ -306,7 +310,7 @@ function sceneUpdate(gd, subplot) {
 
     // In case if we have scene from the last calc - reset data
     if(!scene.dirty) {
-        Lib.extendFlat(scene, reset);
+        Lib.extendFlat(scene, resetOpts);
     }
 
     return scene;
@@ -328,10 +332,7 @@ function plot(gd, subplot, cdata) {
 
     var success = prepareRegl(gd, ['ANGLE_instanced_arrays', 'OES_element_index_uint']);
     if(!success) {
-        scene.error2d = false;
-        scene.line2d = false;
-        scene.scatter2d = false;
-        scene.fill2d = false;
+        scene.init();
         return;
     }
 

test/jasmine/bundle_tests/no_webgl_test.js

@@ -57,6 +57,23 @@ describe('Plotly w/o WebGL support:', function() {
             checkNoWebGLMsg(true);
             return Plotly.react(gd, require('@mocks/10.json'));
         })
+        .then(function() {
+            checkNoWebGLMsg(false);
+
+            // one with all regl2d modules
+            return Plotly.react(gd, [{
+                type: 'scattergl',
+                mode: 'lines+markers',
+                fill: 'tozerox',
+                y: [1, 2, 1],
+                error_x: { value: 10 },
+                error_y: { value: 10 }
+            }]);
+        })
+        .then(function() {
+            checkNoWebGLMsg(true);
+            return Plotly.react(gd, require('@mocks/10.json'));
+        })
         .then(function() {
             checkNoWebGLMsg(false);
         })