minimal fix

Author: archmoj

src/plots/gl3d/index.js

@@ -69,12 +69,6 @@ exports.plot = function plotGl3d(gd) {
         if(!scene.cameraInitial) {
             scene.cameraInitial = Lib.extendDeep({}, sceneLayout.camera);
         }
-        /*
-        if(!sceneLayout._scene.cameraInitial) {
-            sceneLayout._scene.cameraInitial = Lib.extendDeep({}, gd._fullLayout[sceneId].camera);
-        }
-        */
-
         scene.plot(fullSceneData, fullLayout, gd.layout);
     }
 };

src/plots/gl3d/layout/defaults.js

@@ -97,17 +97,6 @@ function handleGl3dDefaults(sceneLayoutIn, sceneLayoutOut, coerce, opts) {
         sceneLayoutIn.aspectmode = sceneLayoutOut.aspectmode;
     }
 
-    var overwriteIn = false;
-    if(sceneLayoutIn.camera &&
-        sceneLayoutIn.camera.up &&
-        sceneLayoutIn.camera.up.z !== 1) {
-        overwriteIn = (sceneLayoutIn.dragmode !== 'turntable') ? true : false;
-    }
-
-    if(overwriteIn === true) {
-        sceneLayoutIn.dragmode = 'orbit';
-    }
-
     supplyGl3dAxisLayoutDefaults(sceneLayoutIn, sceneLayoutOut, {
         font: opts.font,
         scene: opts.id,
@@ -117,10 +106,6 @@ function handleGl3dDefaults(sceneLayoutIn, sceneLayoutOut, coerce, opts) {
         fullLayout: opts.fullLayout
     });
 
-    if(sceneLayoutOut.dragmode === 'turntable') {
-        sceneLayoutOut.camera.up = [0, 0, 1];
-    }
-
     Registry.getComponentMethod('annotations3d', 'handleDefaults')(
         sceneLayoutIn, sceneLayoutOut, opts
     );

src/plots/gl3d/layout/layout_attributes.js

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

src/plots/gl3d/scene.js

@@ -739,6 +739,7 @@ proto.updateFx = function(dragmode, hovermode) {
             camera.keyBindingMode = 'rotate';
 
         } else if(dragmode === 'turntable') {
+            camera.up = [0, 0, 1];
             camera.mode = 'turntable';
             camera.keyBindingMode = 'rotate';
 

test/jasmine/tests/gl3d_plot_interact_test.js

@@ -769,7 +769,7 @@ describe('Test gl3d modebar handlers', function() {
         buttonDefault.click();
     });
 
-    fit('@gl button resetCameraLastSave3d should reset camera to default', function(done) {
+    it('@gl button resetCameraLastSave3d should reset camera to default', function(done) {
         var buttonDefault = selectButton(modeBar, 'resetCameraDefault3d');
         var buttonLastSave = selectButton(modeBar, 'resetCameraLastSave3d');
 
@@ -808,8 +808,6 @@ describe('Test gl3d modebar handlers', function() {
             assertCameraEye(gd._fullLayout.scene, 0.1, 0.1, 1);
             assertCameraEye(gd._fullLayout.scene2, 2.5, 2.5, 2.5);
 
-            console.log("gd._fullLayout.scene._scene.cameraInitial=", gd._fullLayout.scene._scene.cameraInitial);
-
             delete gd._fullLayout.scene._scene.cameraInitial;
             delete gd._fullLayout.scene2._scene.cameraInitial;