cleanup

Author: cpsievert

inst/htmlwidgets/plotly.js

@@ -296,6 +296,25 @@ HTMLWidgets.widget({
       });
     }
 
+    
+    var legendEventData = function(d) {
+      // if legendgroup is not relevant just return the trace
+      var trace = d.data[d.curveNumber];
+      if (!trace.legendgroup) return trace;
+      
+      // if legendgroup was specified, return all traces that match the group
+      var legendgrps = d.data.map(function(trace){ return trace.legendgroup; });
+      var traces = [];
+      for (i = 0; i < legendgrps.length; i++) {
+        if (legendgrps[i] == trace.legendgroup) {
+          traces.push(d.data[i]);
+        }
+      }
+      
+      return traces;
+    };
+
+    
     // send user input event data to shiny
     if (HTMLWidgets.shinyMode) {
 
@@ -938,87 +957,3 @@ function debounce(func, wait, immediate) {
 		if (callNow) func.apply(context, args);
 	};
 };
-
-
-if (HTMLWidgets.shinyMode) {
-  window.plotlyInputEvents
-  
-  // This Shiny.addCustomMessageHandler() callback is fired once per flush
-  // (i.e. whenever an input value changes)
-  Shiny.addCustomMessageHandler("plotlyEventData", function(message) {
-    var evt = message.event;
-    var src = message.source;
-    var priority = message.priority;
-    
-    // Maintain a list of event definitions that we've already registered
-    var msgID = evt + "-" + src + "-" + priority;
-    var plotlyInputEvents = crosstalk.var("plotlyInputEvents").get() || [];
-    if (plotlyInputEvents.indexOf(msgID) > -1) {
-      return;
-    }
-    plotlyInputEvents.push(msgID);
-    crosstalk.var("plotlyInputEvents").set(plotlyInputEvents)
-    
-  });
-}
-
-
- // Attach attributes (e.g., "key", "z") to plotly event data
-function eventDataWithKey(eventData) {
-  if (eventData === undefined || !eventData.hasOwnProperty("points")) {
-    return null;
-  }
-  return eventData.points.map(function(pt) {
-    var obj = {
-      curveNumber: pt.curveNumber, 
-      pointNumber: pt.pointNumber, 
-      x: pt.x,
-      y: pt.y
-    };
-    
-    // If 'z' is reported with the event data, then use it!
-    if (pt.hasOwnProperty("z")) {
-      obj.z = pt.z;
-    }
-    
-    var trace = pt.data;
-    
-    if (!trace._isSimpleKey) {
-      var attrsToAttach = ["key"];
-    } else {
-      // simple keys fire the whole key
-      obj.key = trace.key;
-      var attrsToAttach = [];
-    }
-    
-    for (var i = 0; i < attrsToAttach.length; i++) {
-      var attr = trace[attrsToAttach[i]];
-      if (Array.isArray(attr)) {
-          // pointNumber can be an array (e.g., heatmaps)
-          // TODO: can pointNumber be 3D?
-          obj[attrsToAttach[i]] = typeof pt.pointNumber === "number" ? 
-            attr[pt.pointNumber] : attr[pt.pointNumber[0]][pt.pointNumber[1]];
-       }
-     }
-     return obj;
-   });
-}
-    
-var legendEventData = function(d) {
-  // if legendgroup is not relevant just return the trace
-  var trace = d.data[d.curveNumber];
-  if (!trace.legendgroup) return trace;
-  
-  // if legendgroup was specified, return all traces that match the group
-  var legendgrps = d.data.map(function(trace){ return trace.legendgroup; });
-  var traces = [];
-  for (i = 0; i < legendgrps.length; i++) {
-    if (legendgrps[i] == trace.legendgroup) {
-      traces.push(d.data[i]);
-    }
-  }
-  
-  return traces;
-};
-      
-