Skip to content

Commit b7bebb7

Browse files
Merge pull request #109 from martinRenou/add_scroll_back
Put back the scrolling support
2 parents d1c62c1 + 0ab4b9f commit b7bebb7

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

js/src/mpl_widget.js

+16-5
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ var MPLCanvasView = widgets.DOMWidgetView.extend({
135135

136136
canvas_div.addEventListener('keydown', this.key_event('key_press'));
137137
canvas_div.addEventListener('keyup', this.key_event('key_release'));
138+
138139
// this is important to make the div 'focusable'
139140
canvas_div.setAttribute('tabindex', 0);
140141
this.figure.appendChild(canvas_div);
@@ -170,6 +171,8 @@ var MPLCanvasView = widgets.DOMWidgetView.extend({
170171
rubberband_canvas.addEventListener('mouseenter', this.mouse_event('figure_enter'));
171172
rubberband_canvas.addEventListener('mouseleave', this.mouse_event('figure_leave'));
172173

174+
rubberband_canvas.addEventListener('wheel', this.mouse_event('scroll'));
175+
173176
canvas_div.appendChild(canvas);
174177
canvas_div.appendChild(rubberband_canvas);
175178

@@ -375,8 +378,16 @@ var MPLCanvasView = widgets.DOMWidgetView.extend({
375378
return function(event) {
376379
var canvas_pos = utils.get_mouse_position(event);
377380

378-
if (name === 'button_press')
379-
{
381+
if (name === 'scroll') {
382+
event['data'] = 'scroll'
383+
if (event.deltaY < 0) {
384+
event.step = 1;
385+
} else {
386+
event.step = -1;
387+
}
388+
}
389+
390+
if (name === 'button_press') {
380391
that.canvas.focus();
381392
that.canvas_div.focus();
382393
}
@@ -404,15 +415,15 @@ var MPLCanvasView = widgets.DOMWidgetView.extend({
404415
event.preventDefault();
405416

406417
// Prevent repeat events
407-
if (name == 'key_press')
408-
{
418+
if (name == 'key_press') {
409419
if (event.which === that._key)
410420
return;
411421
else
412422
that._key = event.which;
413423
}
414-
if (name == 'key_release')
424+
if (name == 'key_release') {
415425
that._key = null;
426+
}
416427

417428
var value = '';
418429
if (event.ctrlKey && event.which != 17)

0 commit comments

Comments
 (0)