From 0ff62fc6a2bafeab5ab5fbc1f882df232bd39775 Mon Sep 17 00:00:00 2001 From: Steve Howell Date: Tue, 14 Apr 2020 10:56:54 +0000 Subject: [PATCH] list_render: Use namespaces for events. --- frontend_tests/node_tests/list_render.js | 5 +++-- static/js/list_render.js | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/frontend_tests/node_tests/list_render.js b/frontend_tests/node_tests/list_render.js index f89d7855e4..d0f3d7a35b 100644 --- a/frontend_tests/node_tests/list_render.js +++ b/frontend_tests/node_tests/list_render.js @@ -51,7 +51,8 @@ function make_containers() { // Capture the scroll callback so we can call it in // our tests. - parent_container.scroll = (f) => { + parent_container.on = (sel, f) => { + assert.equal(sel, 'scroll.list_widget_container'); parent_container.call_scroll = () => { f.call(parent_container); }; @@ -77,7 +78,7 @@ function make_search_input() { $element.to_jquery = () => $element; $element.on = (event_name, f) => { - assert.equal(event_name, 'input'); + assert.equal(event_name, 'input.list_widget_filter'); $element.simulate_input_event = () => { const elem = { value: $element.val(), diff --git a/static/js/list_render.js b/static/js/list_render.js index 3eb5a7f9eb..b645a0f275 100644 --- a/static/js/list_render.js +++ b/static/js/list_render.js @@ -248,18 +248,18 @@ exports.create = function ($container, list, opts) { // on scroll of the nearest scrolling container, if it hits the bottom // of the container then fetch a new block of items and render them. - meta.scroll_container.scroll(function () { + meta.scroll_container.on('scroll.list_widget_container', function () { if (this.scrollHeight - (this.scrollTop + this.clientHeight) < 10) { widget.render(); } }); if (opts.parent_container) { - opts.parent_container.on("click", "[data-sort]", exports.handle_sort); + opts.parent_container.on('click.list_widget_sort', "[data-sort]", exports.handle_sort); } if (opts.filter && opts.filter.element) { - opts.filter.element.on("input", function () { + opts.filter.element.on('input.list_widget_filter', function () { const value = this.value.toLocaleLowerCase(); widget.set_filter_value(value); widget.hard_redraw();