reverse axis modebar disabling logic and update names

Author: alexcjohnson

src/components/modebar/buttons.js

@@ -260,9 +260,9 @@ function handleCartesian(gd, ev) {
 
         for(i = 0; i < axList.length; i++) {
             ax = axList[i];
-            allowed = ax.modebarbuttons === 'all' || ax.modebarbuttons.indexOf(
-                (val === 'auto' || val === 'reset') ? 'auto' : 'inout'
-            ) !== -1;
+            allowed = ax.modebardisable === 'none' || ax.modebardisable.indexOf(
+                (val === 'auto' || val === 'reset') ? 'autoscale' : 'zoominout'
+            ) === -1;
 
             if(allowed && !ax.fixedrange) {
                 axName = ax._name;

src/components/modebar/manage.js

@@ -269,7 +269,8 @@ function areAllAxesFixed(fullLayout) {
     var axList = axisIds.list({_fullLayout: fullLayout}, null, true);
 
     for(var i = 0; i < axList.length; i++) {
-        if(!axList[i].fixedrange && axList[i].modebarbuttons !== 'none') {
+        var disabled = axList[i].modebardisable;
+        if(!axList[i].fixedrange && disabled !== 'autoscale+zoominout' && disabled !== 'zoominout+autoscale') {
             return false;
         }
     }

src/plots/cartesian/layout_attributes.js

@@ -389,16 +389,16 @@ module.exports = {
             'If true, then zoom is disabled.'
         ].join(' ')
     },
-    modebarbuttons: {
+    modebardisable: {
         valType: 'flaglist',
-        flags: ['auto', 'inout'],
-        extras: ['all', 'none'],
-        dflt: 'all',
+        flags: ['autoscale', 'zoominout'],
+        extras: ['none'],
+        dflt: 'none',
         editType: 'modebar',
         description: [
-            'Determines which modebar buttons impact this axis.',
-            '*auto* allows the autoscale buttons, *inout* allows the',
-            'zoom-in and zoom-out buttons.'
+            'Disables certain modebar buttons for this axis.',
+            '*autoscale* disables the autoscale buttons, *zoominout*',
+            'disables the zoom-in and zoom-out buttons.'
         ].join(' ')
     },
     insiderange: {

src/plots/cartesian/layout_defaults.js

@@ -338,7 +338,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
         });
 
         coerce('fixedrange');
-        coerce('modebarbuttons');
+        coerce('modebardisable');
 
         addMissingMatchedAxis();
 
@@ -367,7 +367,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
         }
 
         coerce('fixedrange');
-        coerce('modebarbuttons');
+        coerce('modebardisable');
     }
 
     for(i = 0; i < yNames.length; i++) {
@@ -380,7 +380,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
         var fixedRangeDflt = getComponentMethod('rangeslider', 'isVisible')(anchoredAxis);
 
         coerce('fixedrange', fixedRangeDflt);
-        coerce('modebarbuttons');
+        coerce('modebardisable');
     }
 
     // Finally, handle scale constraints and matching axes.

test/jasmine/tests/modebar_test.js

@@ -1194,11 +1194,11 @@ describe('ModeBar', function() {
                     assertRange('yaxis2', [0, 4]);
                 });
 
-                it('should respect modebarbuttons attribute', function(done) {
+                it('should respect modebardisable attribute', function(done) {
                     Plotly.relayout(gd, {
-                        'xaxis.modebarbuttons': 'none',
-                        'xaxis2.modebarbuttons': 'auto',
-                        'yaxis.modebarbuttons': 'inout',
+                        'xaxis.modebardisable': 'zoominout+autoscale',
+                        'xaxis2.modebardisable': 'zoominout',
+                        'yaxis.modebardisable': 'autoscale',
                     }).then(function() {
                         var buttonZoomIn = selectButton(modeBar, 'zoomIn2d');
                         var buttonZoomOut = selectButton(modeBar, 'zoomOut2d');

test/plot-schema.json

@@ -13912,20 +13912,6 @@
       "allticks"
      ]
     },
-    "modebarbuttons": {
-     "description": "Determines which modebar buttons impact this axis. *auto* allows the autoscale buttons, *inout* allows the zoom-in and zoom-out buttons.",
-     "dflt": "all",
-     "editType": "modebar",
-     "extras": [
-      "all",
-      "none"
-     ],
-     "flags": [
-      "auto",
-      "inout"
-     ],
-     "valType": "flaglist"
-    },
     "nticks": {
      "description": "Specifies the maximum number of ticks for the particular axis. The actual number of ticks will be chosen automatically to be less than or equal to `nticks`. Has an effect only if `tickmode` is set to *auto*.",
      "dflt": 0,
@@ -15477,20 +15463,6 @@
       "allticks"
      ]
     },
-    "modebarbuttons": {
-     "description": "Determines which modebar buttons impact this axis. *auto* allows the autoscale buttons, *inout* allows the zoom-in and zoom-out buttons.",
-     "dflt": "all",
-     "editType": "modebar",
-     "extras": [
-      "all",
-      "none"
-     ],
-     "flags": [
-      "auto",
-      "inout"
-     ],
-     "valType": "flaglist"
-    },
     "nticks": {
      "description": "Specifies the maximum number of ticks for the particular axis. The actual number of ticks will be chosen automatically to be less than or equal to `nticks`. Has an effect only if `tickmode` is set to *auto*.",
      "dflt": 0,