linuxster
diff --git a/‎src/components/modebar/buttons.js
Copy file name to clipboardExpand all lines: src/components/modebar/buttons.js
+1-2Lines changed: 1 addition & 2 deletions b/‎src/components/modebar/buttons.js
Copy file name to clipboardExpand all lines: src/components/modebar/buttons.js
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎src/plot_api/plot_api.js
Copy file name to clipboardExpand all lines: src/plot_api/plot_api.js
+7-1Lines changed: 7 additions & 1 deletion b/‎src/plot_api/plot_api.js
Copy file name to clipboardExpand all lines: src/plot_api/plot_api.js
+7-1Lines changed: 7 additions & 1 deletion
diff --git a/‎src/plots/geo/geo.js
Copy file name to clipboardExpand all lines: src/plots/geo/geo.js
+10-1Lines changed: 10 additions & 1 deletion b/‎src/plots/geo/geo.js
Copy file name to clipboardExpand all lines: src/plots/geo/geo.js
+10-1Lines changed: 10 additions & 1 deletion
@@ -447,7 +447,7 @@ modeBarButtons.hoverClosestGeo = {
     toggle: true,
     icon: Icons.tooltip_basic,
     gravity: 'ne',
-    click: handleGeo
+    click: toggleHover
 };
 
 function handleGeo(gd, ev) {
@@ -468,7 +468,6 @@ function handleGeo(gd, ev) {
             geo.render();
         }
         else if(attr === 'reset') geo.zoomReset();
-        else if(attr === 'hovermode') geo.showHover = !geo.showHover;
     }
 }
 
 
@@ -2336,9 +2336,9 @@ Plotly.relayout = function relayout(gd, astr, val) {
 
         // this is decoupled enough it doesn't need async regardless
         if(domodebar) {
+            var subplotIds;
             manageModeBar(gd);
 
-            var subplotIds;
             subplotIds = Plots.getSubplotIds(fullLayout, 'gl3d');
             for(i = 0; i < subplotIds.length; i++) {
                 scene = fullLayout[subplotIds[i]]._scene;
@@ -2350,6 +2350,12 @@ Plotly.relayout = function relayout(gd, astr, val) {
                 scene = fullLayout._plots[subplotIds[i]]._scene2d;
                 scene.updateFx(fullLayout);
             }
+
+            subplotIds = Plots.getSubplotIds(fullLayout, 'geo');
+            for(i = 0; i < subplotIds.length; i++) {
+                var geo = fullLayout[subplotIds[i]]._geo;
+                geo.updateFx(fullLayout.hovermode);
+            }
         }
     }
 
 
@@ -39,7 +39,6 @@ function Geo(options, fullLayout) {
     // a subset of https://github.com/d3/d3-geo-projection
     addProjectionsToD3();
 
-    this.showHover = (fullLayout.hovermode === 'closest');
     this.hoverContainer = null;
 
     this.topojsonName = null;
@@ -56,6 +55,7 @@ function Geo(options, fullLayout) {
     this.zoomReset = null;
 
     this.makeFramework();
+    this.updateFx(fullLayout.hovermode);
 }
 
 module.exports = Geo;
@@ -174,6 +174,15 @@ proto.onceTopojsonIsLoaded = function(geoData, geoLayout) {
     this.render();
 };
 
+proto.updateFx = function(hovermode) {
+    this.showHover = (hovermode !== false);
+
+    // TODO should more strict, any layout.hovermode other
+    // then false will make all geo subplot display hover text.
+    // Instead each geo should have its own geo.hovermode
+    // to control hover visibility independently of other subplots.
+};
+
 proto.makeProjection = function(geoLayout) {
     var projLayout = geoLayout.projection,
         projType = projLayout.type,
Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ modeBarButtons.hoverClosestGeo = {`
`447`	`447`	`toggle: true,`
`448`	`448`	`icon: Icons.tooltip_basic,`
`449`	`449`	`gravity: 'ne',`
`450`		`- click: handleGeo`
	`450`	`+ click: toggleHover`
`451`	`451`	`};`
`452`	`452`
`453`	`453`	`function handleGeo(gd, ev) {`
`@@ -468,7 +468,6 @@ function handleGeo(gd, ev) {`
`468`	`468`	`geo.render();`
`469`	`469`	`}`
`470`	`470`	`else if(attr === 'reset') geo.zoomReset();`
`471`		`- else if(attr === 'hovermode') geo.showHover = !geo.showHover;`
`472`	`471`	`}`
`473`	`472`	`}`
`474`	`473`