revised auto logic i.e. without touching layout inputs

Author: archmoj

src/plots/gl3d/layout/defaults.js

@@ -97,15 +97,25 @@ function handleGl3dDefaults(sceneLayoutIn, sceneLayoutOut, coerce, opts) {
         sceneLayoutIn.aspectmode = sceneLayoutOut.aspectmode;
     }
 
-    function enableTurnTable() {
-        sceneLayoutIn.dragmode = 'turntable';
-    }
+    supplyGl3dAxisLayoutDefaults(sceneLayoutIn, sceneLayoutOut, {
+        font: opts.font,
+        scene: opts.id,
+        data: opts.fullData,
+        bgColor: bgColorCombined,
+        calendar: opts.calendar,
+        fullLayout: opts.fullLayout
+    });
+
+    Registry.getComponentMethod('annotations3d', 'handleDefaults')(
+        sceneLayoutIn, sceneLayoutOut, opts
+    );
+
+    var dragmode = opts.getDfltFromLayout('dragmode');
 
-    if(sceneLayoutIn.dragmode !== false) {
-        if(!sceneLayoutIn.dragmode) {
-            // Because the default is now set to orbit mode
-            // (i.e. in order to apply camera.z.up at init time)
-            // we set turnable our disarable option here.
+    if(dragmode !== false) {
+        if(!dragmode) {
+
+            dragmode = 'orbit';
 
             if(sceneLayoutIn.camera &&
                 sceneLayoutIn.camera.up) {
@@ -115,29 +125,16 @@ function handleGl3dDefaults(sceneLayoutIn, sceneLayoutOut, coerce, opts) {
                 var z = sceneLayoutIn.camera.up.z;
 
                 if(!x || !y || !z) {
-                    enableTurnTable();
+                    dragmode = 'turntable';
                 } else if(z / Math.sqrt(x * x + y * y + z * z) > 0.999) {
-                    enableTurnTable();
+                    dragmode = 'turntable';
                 }
             } else {
-                enableTurnTable();
+                dragmode = 'turntable';
             }
         }
     }
 
-    supplyGl3dAxisLayoutDefaults(sceneLayoutIn, sceneLayoutOut, {
-        font: opts.font,
-        scene: opts.id,
-        data: opts.fullData,
-        bgColor: bgColorCombined,
-        calendar: opts.calendar,
-        fullLayout: opts.fullLayout
-    });
-
-    Registry.getComponentMethod('annotations3d', 'handleDefaults')(
-        sceneLayoutIn, sceneLayoutOut, opts
-    );
-
-    coerce('dragmode', opts.getDfltFromLayout('dragmode'));
+    coerce('dragmode', dragmode);
     coerce('hovermode', opts.getDfltFromLayout('hovermode'));
 }

src/plots/gl3d/layout/layout_attributes.js

@@ -140,7 +140,6 @@ module.exports = {
         valType: 'enumerated',
         role: 'info',
         values: ['orbit', 'turntable', 'zoom', 'pan', false],
-        dflt: 'orbit',
         editType: 'plot',
         description: [
             'Determines the mode of drag interactions for this scene.'

test/jasmine/tests/gl3d_plot_interact_test.js

@@ -523,7 +523,7 @@ describe('Test gl3d plots', function() {
 
     it('@gl should be able to reversibly change trace type', function(done) {
         var _mock = Lib.extendDeep({}, mock2);
-        var sceneLayout = { aspectratio: { x: 1, y: 1, z: 1 }, dragmode: 'turntable' };
+        var sceneLayout = { aspectratio: { x: 1, y: 1, z: 1 } };
 
         Plotly.plot(gd, _mock)
         .then(delay(20))

test/jasmine/tests/gl3dlayout_test.js

@@ -178,7 +178,7 @@ describe('Test Gl3d layout defaults', function() {
             layoutIn = { scene: {}, dragmode: 'orbit' };
             supplyLayoutDefaults(layoutIn, layoutOut, fullData);
             expect(layoutOut.scene.dragmode)
-                .toBe('turntable', 'to turntable if valid and 3d only');
+                .toBe('orbit', 'to turntable if valid and 3d only');
 
             layoutIn = { scene: {}, dragmode: 'invalid' };
             supplyLayoutDefaults(layoutIn, layoutOut, fullData);
@@ -230,15 +230,14 @@ describe('Test Gl3d layout defaults', function() {
                 .toBe('closest', 'to default if not valid');
         });
 
-        it('should add data-only scenes into layoutIn and also enable turntable', function() {
+        it('should add data-only scenes into layoutIn', function() {
             layoutIn = {};
             fullData = [{ type: 'scatter3d', scene: 'scene' }];
 
             supplyLayoutDefaults(layoutIn, layoutOut, fullData);
             expect(layoutIn.scene).toEqual({
                 aspectratio: { x: 1, y: 1, z: 1 },
-                aspectmode: 'auto',
-                dragmode: 'turntable'
+                aspectmode: 'auto'
             });
         });