Clean up

Author: dy

src/traces/scattergl/calc.js

@@ -9,14 +9,8 @@
 
 'use strict';
 
-var isNumeric = require('fast-isnumeric');
-
 var Axes = require('../../plots/cartesian/axes');
 
-var calcColorscale = require('../scatter/colorscale_calc');
-var arraysToCalcdata = require('../scatter/arrays_to_calcdata');
-
-
 module.exports = function calc(gd, trace) {
     var xa = Axes.getFromId(gd, trace.xaxis || 'x'),
         ya = Axes.getFromId(gd, trace.yaxis || 'y');

src/traces/scattergl/convert.js

@@ -101,9 +101,7 @@ function LineWithMarkers(scene, uid) {
     };
     var scatterOptions1 = Lib.extendFlat({}, scatterOptions0, {snapPoints: false});
 
-    this.scatter = this.initObject(function (plot, options) {
-        return createScatter(plot, options)
-    }, scatterOptions0, 3);
+    this.scatter = this.initObject(createScatter, scatterOptions0, 3);
     this.fancyScatter = this.initObject(createFancyScatter, scatterOptions0, 4);
     this.selectScatter = this.initObject(createScatter, scatterOptions1, 5);
 }
@@ -120,9 +118,9 @@ proto.initObject = function(createFn, options, objIndex) {
         update: update,
         clear: clear,
         dispose: dispose
-    }
+    };
 
-    return result
+    return result;
 
     function update() {
         if(!obj) {

src/traces/scattergl/select.js

@@ -17,7 +17,6 @@ module.exports = function selectPoints(searchInfo, polygon) {
         ya = searchInfo.yaxis,
         selection = [],
         trace = cd[0].trace,
-        curveNumber = trace.index,
         i,
         di,
         x,
@@ -31,25 +30,21 @@ module.exports = function selectPoints(searchInfo, polygon) {
     if(trace.visible !== true || hasOnlyLines) return;
 
     // filter out points by visible scatter ones
-    // var scatter2d = scattergl.scatter.instance
-
-    if(polygon === false) { // clear selection
+    if(polygon === false) {
+        // clear selection
         for(i = 0; i < cd.length; i++) cd[i].dim = 0;
     }
     else {
         for(i = 0; i < cd.length; i++) {
             di = cd[i];
-            //FIXME: this affects performance for 1e6 points
+            // FIXME: this affects performance for 1e6 points
             x = xa.c2p(di.x);
             y = ya.c2p(di.y);
             if(polygon.contains([x, y])) {
                 selection.push({
-                    // curveNumber: curveNumber,
                     // pointNumber: i,
                     x: di.x,
-                    y: di.y,
-                    // FIXME: di.id is undefined for scattergls
-                    // id: di.id
+                    y: di.y
                 });
                 di.dim = 0;
             }