add per-basePlot-module updateFx methods

etpinard · etpinard · commit 2488f4b71ff7 · 2017-09-25T15:23:31.000-04:00
- making doModebar update subroutine much more manageable
diff --git a/src/plot_api/subroutines.js b/src/plot_api/subroutines.js
@@ -490,35 +490,15 @@ exports.doTicksRelayout = function(gd) {
 
 exports.doModeBar = function(gd) {
     var fullLayout = gd._fullLayout;
-    var subplotIds, subplotLayout, subplotObj, i;
 
     ModeBar.manage(gd);
     initInteractions(gd);
 
-    subplotIds = Plots.getSubplotIds(fullLayout, 'gl3d');
-    for(i = 0; i < subplotIds.length; i++) {
-        subplotObj = fullLayout[subplotIds[i]]._scene;
-        subplotObj.updateFx(fullLayout.dragmode, fullLayout.hovermode);
+    for(var i = 0; i < fullLayout._basePlotModules.length; i++) {
+        var updateFx = fullLayout._basePlotModules[i].updateFx;
+        if(updateFx) updateFx(fullLayout);
     }
 
-    subplotIds = Plots.getSubplotIds(fullLayout, 'gl2d');
-    for(i = 0; i < subplotIds.length; i++) {
-        subplotObj = fullLayout._plots[subplotIds[i]]._scene2d;
-        subplotObj.updateFx(fullLayout.dragmode);
-    }
-
-    subplotIds = Plots.getSubplotIds(fullLayout, 'mapbox');
-    for(i = 0; i < subplotIds.length; i++) {
-        subplotObj = fullLayout[subplotIds[i]]._subplot;
-        subplotObj.updateFx(fullLayout);
-    }
-
-    subplotIds = Plots.getSubplotIds(fullLayout, 'geo');
-    for(i = 0; i < subplotIds.length; i++) {
-        subplotLayout = fullLayout[subplotIds[i]];
-        subplotObj = subplotLayout._subplot;
-        subplotObj.updateFx(fullLayout, subplotLayout);
-    }
 
     return Plots.previousPromises(gd);
 };
diff --git a/src/plots/geo/index.js b/src/plots/geo/index.js
@@ -77,3 +77,13 @@ exports.clean = function(newFullData, newFullLayout, oldFullData, oldFullLayout)
         }
     }
 };
+
+exports.updateFx = function(fullLayout) {
+    var subplotIds = Plots.getSubplotIds(fullLayout, GEO);
+
+    for(var i = 0; i < subplotIds.length; i++) {
+        var subplotLayout = fullLayout[subplotIds[i]];
+        var subplotObj = subplotLayout._subplot;
+        subplotObj.updateFx(fullLayout, subplotLayout);
+    }
+};
diff --git a/src/plots/gl2d/index.js b/src/plots/gl2d/index.js
@@ -130,3 +130,12 @@ exports.toSVG = function(gd) {
         scene.destroy();
     }
 };
+
+exports.updateFx = function(fullLayout) {
+    var subplotIds = Plots.getSubplotIds(fullLayout, 'gl2d');
+
+    for(var i = 0; i < subplotIds.length; i++) {
+        var subplotObj = fullLayout._plots[subplotIds[i]]._scene2d;
+        subplotObj.updateFx(fullLayout.dragmode);
+    }
+};
diff --git a/src/plots/gl3d/index.js b/src/plots/gl3d/index.js
@@ -128,3 +128,12 @@ exports.cleanId = function cleanId(id) {
 
     return SCENE + sceneNum;
 };
+
+exports.updateFx = function(fullLayout) {
+    var subplotIds = Plots.getSubplotIds(fullLayout, GL3D);
+
+    for(var i = 0; i < subplotIds.length; i++) {
+        var subplotObj = fullLayout[subplotIds[i]]._scene;
+        subplotObj.updateFx(fullLayout.dragmode, fullLayout.hovermode);
+    }
+};
diff --git a/src/plots/mapbox/index.js b/src/plots/mapbox/index.js
@@ -155,3 +155,12 @@ function findAccessToken(gd, mapboxIds) {
 
     return accessToken;
 }
+
+exports.updateFx = function(fullLayout) {
+    var subplotIds = Plots.getSubplotIds(fullLayout, MAPBOX);
+
+    for(var i = 0; i < subplotIds.length; i++) {
+        var subplotObj = fullLayout[subplotIds[i]]._subplot;
+        subplotObj.updateFx(fullLayout);
+    }
+};

Original file line number	Diff line number	Diff line change
`@@ -77,3 +77,13 @@ exports.clean = function(newFullData, newFullLayout, oldFullData, oldFullLayout)`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`};`
	`80`	`+`
	`81`	`+exports.updateFx = function(fullLayout) {`
	`82`	`+ var subplotIds = Plots.getSubplotIds(fullLayout, GEO);`
	`83`	`+`
	`84`	`+ for(var i = 0; i < subplotIds.length; i++) {`
	`85`	`+ var subplotLayout = fullLayout[subplotIds[i]];`
	`86`	`+ var subplotObj = subplotLayout._subplot;`
	`87`	`+ subplotObj.updateFx(fullLayout, subplotLayout);`
	`88`	`+ }`
	`89`	`+};`