Add scroll event handling to javascript

blink1073 · blink1073 · commit 39455794c8a0 · 2015-01-11T16:01:48.000-06:00
Conflicts:
	lib/matplotlib/backends/web_backend/mpl.js
diff --git a/lib/matplotlib/backends/web_backend/mpl.js b/lib/matplotlib/backends/web_backend/mpl.js
@@ -425,6 +425,7 @@ mpl.findpos = function(e) {
 };
 
 mpl.figure.prototype.mouse_event = function(event, name) {
+
     var canvas_pos = mpl.findpos(event)
 
     if (name === 'button_press')
@@ -436,6 +437,11 @@ mpl.figure.prototype.mouse_event = function(event, name) {
     var x = canvas_pos.x;
     var y = canvas_pos.y;
 
+<<<<<<< HEAD
+=======
+    console.log(name);
+
+>>>>>>> b1331ff... Add scroll event handling to javascript
     this.send_message(name, {x: x, y: y, button: event.button,
                              step: event.step});
 
diff --git a/lib/matplotlib/backends/web_backend/temp.txt b/lib/matplotlib/backends/web_backend/temp.txt
@@ -0,0 +1,21 @@
+import matplotlib
+import itertools
+import numpy as np
+matplotlib.use('webagg')
+import matplotlib.pyplot as plt
+plt.close('all')
+fig, ax = plt.subplots()
+x = np.linspace(0,10,100)
+y = np.sin(x)
+ln, = ax.plot(x,y, 'o', picker=5)
+evt = []
+colors = iter(itertools.cycle(['r', 'g', 'b', 'k', 'c']))
+def on_event(event):
+    evt.append(event)
+    ln.set_color(next(colors))
+    fig.canvas.draw()
+    fig.canvas.draw_idle()
+fig.canvas.mpl_connect('figure_enter_event', on_event)
+fig.canvas.mpl_connect('figure_leave_event', on_event)
+plt.show()
+
