Remove debug prints

blink1073 · blink1073 · commit 0aebfebd8d24 · 2015-01-11T16:00:10.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
@@ -142,8 +142,27 @@ mpl.figure.prototype._init_canvas = function() {
     // Throttle sequential mouse events to 1 every 20ms.
     rubberband.mousemove('motion_notify', mouse_event_fn);
 
+<<<<<<< HEAD
     rubberband.mouseenter('figure_enter', mouse_event_fn);
     rubberband.mouseleave('figure_leave', mouse_event_fn);
+=======
+    function scroll_fn(event) {
+        event['data'] = 'scroll'
+        // http://www.adomas.org/javascript-mouse-wheel/
+        if (event.wheelDelta) { /* IE/Opera. */
+                event.step = event.wheelDelta/120;
+        } else if (event.detail) { /** Mozilla case. */
+            /** In Mozilla, sign of delta is different than in IE.
+             * Also, delta is multiple of 3.
+             */
+            event.step = -event.detail/3;
+        }
+        mouse_event_fn(event);
+    }
+
+    $(canvas_div)[0].addEventListener('DOMMouseScroll', scroll_fn, false);
+    $(canvas_div)[0].addEventListener('mousewheel', scroll_fn, false);
+>>>>>>> 2335705... Remove debug prints
 
     canvas_div.append(canvas);
     canvas_div.append(rubberband);
