don't try to attach key to relayout event data; fixes #1039

also, make use of HTMLWidgets.shinyMode and remove old code

Author: cpsievert

inst/htmlwidgets/plotly.js

@@ -24,12 +24,10 @@ HTMLWidgets.widget({
 
   renderValue: function(el, x, instance) {
 
-    var shinyMode;
     if (typeof(window) !== "undefined") {
-      // make sure plots don't get created outside the network
+      // make sure plots don't get created outside the network (for on-prem)
       window.PLOTLYENV = window.PLOTLYENV || {};
       window.PLOTLYENV.BASE_URL = x.base_url;
-      shinyMode = !!window.Shiny;
     }
 
     var graphDiv = document.getElementById(el.id);
@@ -209,12 +207,12 @@ HTMLWidgets.widget({
     }
 
     // send user input event data to shiny
-    if (shinyMode) {
+    if (HTMLWidgets.shinyMode) {
       // https://plot.ly/javascript/zoom-events/
       graphDiv.on('plotly_relayout', function(d) {
         Shiny.onInputChange(
           ".clientValue-plotly_relayout-" + x.source, 
-          JSON.stringify(eventDataWithKey(d))
+          JSON.stringify(d)
         );
       });
       graphDiv.on('plotly_hover', function(d) {
@@ -805,70 +803,3 @@ function removeBrush(el) {
     outlines[i].remove();
   }
 }
-
-/* Currently not used
-
-// Given an array of strings, return an object that hierarchically
-// represents the corresponding curves/points.
-//
-// For example, the following data:
-//
-// [
-//   {curveNumber: 0, pointNumber: 1},
-//   {curveNumber: 0, pointNumber: 2},
-//   {curveNumber: 2, pointNumber: 1}
-// ]
-//
-// would be returned as:
-// {
-//   "0": [1, 2],
-//   "2": [1]
-// }
-
-// # Begin Crosstalk support
-    
-// ## Crosstalk point/key translation functions
-//
-// Plotly.js uses curveNumber/pointNumber addressing to refer
-// to data points (i.e. when plotly_selected is received). We
-// prefer to let the R user use key-based addressing, where
-// a string is used that uniquely identifies a data point (we
-// can also use row numbers in a pinch).
-//
-// The pointsToKeys and keysToPoints functions let you convert
-// between the two schemes.
-
-// Combine the name of a set and key into a single string, suitable for
-// using as a keyCache key.
-function joinSetAndKey(set, key) {
-  return set + "\n" + key;
-}
-
-// To allow translation from sets+keys to points in O(1) time, we
-// make a cache that lets us map keys to objects with
-// {curveNumber, pointNumber} properties.
-var keyCache = {};
-for (var i = 0; i < x.data.length; i++) {
-  var trace = x.data[i];
-  if (!trace.key || !trace.set) {
-    continue;
-  }
-  for (var j = 0; j < trace.key.length; j++) {
-    var nm = joinSetAndKey(trace.set, trace.key[j]);
-    keyCache[nm] = {curveNumber: i, pointNumber: j};
-  }
-}
-
-function keysToPoints(set, keys) {
-  var curves = {};
-  for (var i = 0; i < keys.length; i++) {
-    var pt = keyCache[joinSetAndKey(set, keys[i])];
-    if (!pt) {
-      throw new Error("Unknown key " + keys[i]);
-    }
-    curves[pt.curveNumber] = curves[pt.curveNumber] || [];
-    curves[pt.curveNumber].push(pt.pointNumber);
-  }
-  return curves;
-}
-*/