add gl2d plot index + register it in plotly.js

Author: etpinard

src/plot_api/plot_api.js

@@ -418,39 +418,6 @@ function setPlotContext(gd, config) {
     }
 }
 
-function plotGl2d(gd) {
-    var fullLayout = gd._fullLayout,
-        fullData = gd._fullData,
-        subplotIds = plots.getSubplotIds(fullLayout, 'gl2d');
-
-    for(var i = 0; i < subplotIds.length; i++) {
-        var subplotId = subplotIds[i],
-            subplotObj = fullLayout._plots[subplotId],
-            fullSubplotData = plots.getSubplotData(fullData, 'gl2d', subplotId);
-        var scene;
-
-        // ref. to corresp. Scene instance
-        scene = subplotObj._scene2d;
-
-        // If Scene is not instantiated, create one!
-        if(scene === undefined) {
-            scene = new Plotly.Scene2D({
-                    container: gd.querySelector('.gl-container'),
-                    id: subplotId,
-                    staticPlot: gd._context.staticPlot,
-                    plotGlPixelRatio: gd._context.plotGlPixelRatio
-                },
-                fullLayout
-            );
-
-            // set ref to Scene instance
-            subplotObj._scene2d = scene;
-        }
-
-        scene.plot(fullSubplotData, fullLayout, gd.layout);
-    }
-}
-
 function plotPolar(gd, data, layout) {
     // build or reuse the container skeleton
     var plotContainer = d3.select(gd).selectAll('.plot-container')

src/plotly.js

@@ -44,7 +44,10 @@ var Geo = require('./plots/geo');
 Plots.registerSubplot(Geo);
 exports.Scene = require('./plots/gl3d/scene');
 exports.Gl3dLayout = require('./plots/gl3d/layout');
-exports.Scene2D = require('./plots/gl2d/scene2d');
+
+var Gl2d = require('./plots/gl2d');
+Plots.registerSubplot(Gl2d);
+
 exports.micropolar = require('./plots/polar/micropolar');
 
 // components

src/plots/gl2d/index.js

@@ -0,0 +1,57 @@
+/**
+* Copyright 2012-2016, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+
+'use strict';
+
+var Plotly = require('../../plotly');
+
+var Scene2D = require('./scene2d');
+
+var Plots = Plotly.Plots;
+
+
+exports.type = 'gl2d';
+
+exports.attr = ['xaxis', 'yaxis'];
+
+exports.idRoot =  ['x', 'y'];
+
+exports.attributes = require('../cartesian/attributes');
+
+exports.plot = function plotGl2d(gd) {
+    var fullLayout = gd._fullLayout,
+        fullData = gd._fullData,
+        subplotIds = Plots.getSubplotIds(fullLayout, 'gl2d');
+
+    for(var i = 0; i < subplotIds.length; i++) {
+        var subplotId = subplotIds[i],
+            subplotObj = fullLayout._plots[subplotId],
+            fullSubplotData = Plots.getSubplotData(fullData, 'gl2d', subplotId);
+
+        // ref. to corresp. Scene instance
+        var scene = subplotObj._scene2d;
+
+        // If Scene is not instantiated, create one!
+        if(scene === undefined) {
+            scene = new Scene2D({
+                    container: gd.querySelector('.gl-container'),
+                    id: subplotId,
+                    staticPlot: gd._context.staticPlot,
+                    plotGlPixelRatio: gd._context.plotGlPixelRatio
+                },
+                fullLayout
+            );
+
+            // set ref to Scene instance
+            subplotObj._scene2d = scene;
+        }
+
+        scene.plot(fullSubplotData, fullLayout, gd.layout);
+    }
+};

src/plots/gl2d/scene2d.js

@@ -25,8 +25,6 @@ var showNoWebGlMsg = require('../../lib/show_no_webgl_msg');
 var AXES = ['xaxis', 'yaxis'];
 var STATIC_CANVAS, STATIC_CONTEXT;
 
-Plotly.Plots.registerSubplot('gl2d', ['xaxis', 'yaxis'], ['x', 'y'],
-    Plotly.Axes.attributes);
 
 function Scene2D(options, fullLayout) {
     this.container = options.container;