misc. fixups for appendArrayPointValue

Author: etpinard

src/components/fx/helpers.js

@@ -87,23 +87,26 @@ function quadrature(dx, dy) {
 
 /** Appends values inside array attributes corresponding to given point number
  *
- * @param {object} pointData : point data object (gets mutated here
+ * @param {object} pointData : point data object (gets mutated here)
  * @param {object} trace : full trace object
- * @param {number} ptNumber : point number
+ * @param {number} pointNumber : point number
  */
-exports.appendArrayPointValue = function(pointData, trace, ptNumber) {
+exports.appendArrayPointValue = function(pointData, trace, pointNumber) {
     var arrayAttrs = trace._arrayAttrs;
 
     for(var i = 0; i < arrayAttrs.length; i++) {
         var astr = arrayAttrs[i];
         var key;
 
         if(astr === 'ids') key = 'id';
-        else if(astr === 'location') key = 'location';
+        else if(astr === 'locations') key = 'location';
         else key = astr;
 
         if(pointData[key] === undefined) {
-            pointData[key] = Lib.nestedProperty(trace, astr).get()[ptNumber];
+            var val = Lib.nestedProperty(trace, astr).get();
+            pointData[key] = Array.isArray(pointNumber) ?
+                val[pointNumber[0]][pointNumber[1]] :
+                val[pointNumber];
         }
     }
 };

src/components/fx/hover.js

@@ -447,19 +447,17 @@ function _hover(gd, evt, subplot) {
             pointNumber: pt.index
         };
 
-        // could maybe :hocho: _module.eventData
         if(pt.trace._module.eventData) out = pt.trace._module.eventData(out, pt);
         else {
             out.x = pt.xVal;
             out.y = pt.yVal;
-
             out.xaxis = pt.xa;
             out.yaxis = pt.ya;
 
             if(pt.zLabelVal !== undefined) out.z = pt.zLabelVal;
         }
 
-        helpers.appendArrayPointValue(out, trace, pt.index);
+        helpers.appendArrayPointValue(out, pt.trace, pt.index);
         newhoverdata.push(out);
     }
 

src/plot_api/plot_schema.js

@@ -157,7 +157,9 @@ exports.findArrayAttributes = function(trace) {
     }
 
     exports.crawl(baseAttributes, callback);
-    exports.crawl(trace._module.attributes, callback);
+    if(trace._module && trace._module.attributes) {
+        exports.crawl(trace._module.attributes, callback);
+    }
 
     if(trace.transforms) {
         var transforms = trace.transforms;
@@ -177,9 +179,8 @@ exports.findArrayAttributes = function(trace) {
     // At the moment, we need this block to make sure that
     // ohlc and candlestick 'open', 'high', 'low', 'close' can be
     // used with filter ang groupby transforms.
-    if(trace._fullInput) {
+    if(trace._fullInput && trace._fullInput._module && trace._fullInput._module.attributes) {
         exports.crawl(trace._fullInput._module.attributes, callback);
-
         arrayAttributes = Lib.filterUnique(arrayAttributes);
     }
 

src/plots/gl3d/scene.js

@@ -112,7 +112,7 @@ function render(scene) {
             pointNumber: ptNumber
         };
 
-        Fx.appendArrayPointValue(pointData);
+        Fx.appendArrayPointValue(pointData, trace, ptNumber);
 
         var eventData = {points: [pointData]};