mv gd._modules -> fullLayout._modules

Author: etpinard

src/plot_api/plot_api.js

@@ -205,7 +205,7 @@ Plotly.plot = function(gd, data, layout, config) {
         if(!recalc) return;
 
         var subplots = Plots.getSubplotIds(fullLayout, 'cartesian'),
-            modules = gd._modules;
+            modules = fullLayout._modules;
 
         // position and range calculations for traces that
         // depend on each other ie bars (stacked or grouped)

src/plots/cartesian/index.js

@@ -30,7 +30,7 @@ exports.plot = function(gd) {
     var fullLayout = gd._fullLayout,
         subplots = Plots.getSubplotIds(fullLayout, 'cartesian'),
         calcdata = gd.calcdata,
-        modules = gd._modules;
+        modules = fullLayout._modules;
 
     function getCdSubplot(calcdata, subplot) {
         var cdSubplot = [];

src/plots/plots.js

@@ -447,8 +447,9 @@ plots.supplyDefaults = function(gd) {
         oldFullData = gd._fullData || [],
         newFullData = gd._fullData = [],
         newData = gd.data || [],
-        modules = gd._modules = [];
+        newData = gd.data || [];
 
+    var modules = newFullLayout._modules = [];
     var i, trace, fullTrace, _module, axList, ax;
 
 
@@ -792,7 +793,6 @@ plots.purge = function(gd) {
 
     // these get recreated on Plotly.plot anyway, but just to be safe
     // (and to have a record of them...)
-    delete gd._modules;
     delete gd._tester;
     delete gd._testref;
     delete gd._promises;
@@ -810,7 +810,7 @@ plots.purge = function(gd) {
 };
 
 plots.style = function(gd) {
-    var _modules = gd._modules;
+    var _modules = gd._fullLayout._modules;
 
     for(var i = 0; i < _modules.length; i++) {
         var _module = _modules[i];

src/traces/scatterternary/style.js

@@ -12,13 +12,16 @@
 var scatterStyle = require('../scatter/style');
 
 
-module.exports = function style(graphDiv) {
-    for(var i = 0; i < graphDiv._modules.length; i++) {
-        // we're just going to call scatter style... if we already
-        // called it, don't need to redo.
-        // Later though we may want differences, or we may make style
-        // more specific in its scope, then we can remove this.
-        if(graphDiv._modules[i].name === 'scatter') return;
+module.exports = function style(gd) {
+    var modules = gd._fullLayout._modules;
+
+    // we're just going to call scatter style... if we already
+    // called it, don't need to redo.
+    // Later though we may want differences, or we may make style
+    // more specific in its scope, then we can remove this.
+    for(var i = 0; i < modules.length; i++) {
+        if(modules[i].name === 'scatter') return;
     }
-    scatterStyle(graphDiv);
+
+    scatterStyle(gd);
 };

test/jasmine/tests/plots_test.js

@@ -351,7 +351,6 @@ describe('Test Plots', function() {
             expect(gd.undonum).toBeUndefined();
             expect(gd.autoplay).toBeUndefined();
             expect(gd.changed).toBeUndefined();
-            expect(gd._modules).toBeUndefined();
             expect(gd._tester).toBeUndefined();
             expect(gd._testref).toBeUndefined();
             expect(gd._promises).toBeUndefined();