Remove unused variable and function

Author: blink1073

lib/matplotlib/backends/web_backend/mpl.js

@@ -46,7 +46,6 @@ mpl.figure = function(figure_id, websocket, ondownload, parent_element) {
     this._root_extra_style(this.root)
     this.root.attr('style', 'display: inline-block');
 
-    this.parent_element = parent_element
     $(parent_element).append(this.root);
 
     this._init_header(this);
@@ -96,6 +95,7 @@ mpl.figure.prototype._init_header = function() {
 }
 
 
+
 mpl.figure.prototype._canvas_extra_style = function(canvas_div) {
 
 }
@@ -142,27 +142,9 @@ 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);