remove 🐫 in modebar layout attributes

antoinerg · antoinerg · commit fc47c72847f0 · 2018-10-03T17:05:45.000-04:00
diff --git a/src/components/modebar/modebar.js b/src/components/modebar/modebar.js
@@ -57,15 +57,15 @@ proto.update = function(graphInfo, buttons) {
     }
     else this.element.className = 'modebar';
 
-    if(fullLayout.modeBarStyle.orientation === 'v') {
+    if(fullLayout.modebar.orientation === 'v') {
         this.element.className += ' vertical';
         buttons = buttons.reverse();
     }
 
-    Lib.addRelatedStyleRule(modeBarId, '#' + modeBarId, 'background-color: ' + fullLayout.modeBarStyle.bgcolor);
-    Lib.addRelatedStyleRule(modeBarId, '#' + modeBarId + ' .modebar-btn .icon path', 'fill: ' + fullLayout.modeBarStyle.iconColor);
-    Lib.addRelatedStyleRule(modeBarId, '#' + modeBarId + ' .modebar-btn:hover .icon path', 'fill: ' + fullLayout.modeBarStyle.activeIconColor);
-    Lib.addRelatedStyleRule(modeBarId, '#' + modeBarId + ' .modebar-btn.active .icon path', 'fill: ' + fullLayout.modeBarStyle.activeIconColor);
+    Lib.addRelatedStyleRule(modeBarId, '#' + modeBarId, 'background-color: ' + fullLayout.modebar.bgcolor);
+    Lib.addRelatedStyleRule(modeBarId, '#' + modeBarId + ' .modebar-btn .icon path', 'fill: ' + fullLayout.modebar.color);
+    Lib.addRelatedStyleRule(modeBarId, '#' + modeBarId + ' .modebar-btn:hover .icon path', 'fill: ' + fullLayout.modebar.activecolor);
+    Lib.addRelatedStyleRule(modeBarId, '#' + modeBarId + ' .modebar-btn.active .icon path', 'fill: ' + fullLayout.modebar.activecolor);
 
     // if buttons or logo have changed, redraw modebar interior
     var needsNewButtons = !this.hasButtons(buttons);
@@ -80,7 +80,7 @@ proto.update = function(graphInfo, buttons) {
         this.updateButtons(buttons);
 
         if(context.displaylogo) {
-            if(fullLayout.modeBarStyle.orientation === 'v') {
+            if(fullLayout.modebar.orientation === 'v') {
                 this.element.prepend(this.getLogo());
             } else {
                 this.element.appendChild(this.getLogo());
diff --git a/src/plots/layout_attributes.js b/src/plots/layout_attributes.js
@@ -225,7 +225,7 @@ module.exports = {
             'make an item with matching `templateitemname` and `visible: false`.'
         ].join(' ')
     },
-    modeBarStyle: {
+    modebar: {
         orientation: {
             valType: 'enumerated',
             values: ['v', 'h'],
@@ -241,14 +241,14 @@ module.exports = {
             editType: 'modebar',
             description: 'Sets the background color of the modebar.'
         },
-        iconColor: {
+        color: {
             valType: 'color',
             role: 'style',
             dflt: 'rgba(0, 31, 95, 0.3)',
             editType: 'modebar',
             description: 'Sets the color of the icons in the modebar.'
         },
-        activeIconColor: {
+        activecolor: {
             valType: 'color',
             role: 'style',
             dflt: 'rgba(0, 22, 72, 0.5)',
diff --git a/src/plots/plots.js b/src/plots/plots.js
@@ -1334,10 +1334,10 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut, formatObj) {
 
     coerce('datarevision');
 
-    coerce('modeBarStyle.orientation');
-    coerce('modeBarStyle.bgcolor');
-    coerce('modeBarStyle.iconColor');
-    coerce('modeBarStyle.activeIconColor');
+    coerce('modebar.orientation');
+    coerce('modebar.bgcolor');
+    coerce('modebar.color');
+    coerce('modebar.activecolor');
 
     Registry.getComponentMethod(
         'calendars',
diff --git a/test/jasmine/tests/modebar_test.js b/test/jasmine/tests/modebar_test.js
@@ -33,10 +33,11 @@ describe('ModeBar', function() {
                 _paperdiv: d3.select(getMockContainerTree()),
                 _has: Plots._hasPlotType,
                 _subplots: {xaxis: xaxes || [], yaxis: yaxes || []},
-                modeBarStyle: {
+                modebar: {
                     orientation: 'h',
                     bgcolor: 'rgba(255,255,255,0.7)',
-                    iconColor: 'rgba(0, 31, 95, 0.3)'
+                    color: 'rgba(0, 31, 95, 0.3)',
+                    activecolor: 'rgba(0, 31, 95, 1)'
                 }
             },
             _fullData: [],
