fixed reset camera to work after switching projection types

Author: archmoj

src/components/modebar/buttons.js

@@ -347,15 +347,19 @@ function handleCamera3d(gd, ev) {
         var key = sceneId + '.camera';
         var scene = fullLayout[sceneId]._scene;
 
-        if(attr === 'resetDefault') {
+        if(attr === 'resetDefault' || attr === 'resetLastSave') {
             aobj[key] = Lib.extendDeep({}, scene.cameraInitial);
+
+            aobj[key].projection = {
+                type: (scene.camera._ortho) ? 'orthographic' : 'perspective'
+            };
+        }
+
+        if(attr === 'resetDefault') {
             aobj[key].up = null;
             aobj[key].eye = null;
             aobj[key].center = null;
         }
-        else if(attr === 'resetLastSave') {
-            aobj[key] = Lib.extendDeep({}, scene.cameraInitial);
-        }
     }
 
     Registry.call('_guiRelayout', gd, aobj);

src/plot_api/plot_api.js

@@ -1589,7 +1589,7 @@ function _restyle(gd, aobj, traces) {
     // and figure out what kind of graphics update we need to do
     for(var ai in aobj) {
         if(helpers.hasParent(aobj, ai)) {
-            throw new Error('cannot set ' + ai + 'and a parent attribute simultaneously');
+            throw new Error('cannot set ' + ai + ' and a parent attribute simultaneously');
         }
 
         var vi = aobj[ai];
@@ -2095,7 +2095,7 @@ function _relayout(gd, aobj) {
     // alter gd.layout
     for(var ai in aobj) {
         if(helpers.hasParent(aobj, ai)) {
-            throw new Error('cannot set ' + ai + 'and a parent attribute simultaneously');
+            throw new Error('cannot set ' + ai + ' and a parent attribute simultaneously');
         }
 
         var p = layoutNP(layout, ai);