Attach scrolling handler to canvas_div

blink1073 · blink1073 · commit f20d0ee4afd3 · 2015-01-11T16:02:36.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
@@ -438,14 +438,6 @@ mpl.figure.prototype.mouse_event = function(event, name) {
     var x = canvas_pos.x;
     var y = canvas_pos.y;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    console.log(name);
-
->>>>>>> b1331ff... Add scroll event handling to javascript
-=======
->>>>>>> 6b3ae27... Remove debug print
     this.send_message(name, {x: x, y: y, button: event.button,
                              step: event.step});
 
