From: Jukka Kurkela Date: Wed, 6 Feb 2019 07:26:53 +0000 (+0200) Subject: Rename addEventListener and removeEventListener (#6046) X-Git-Tag: v2.8.0-rc.1~32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbb7ff7754a0a1619b77a481f6e715c0975c1e6b;p=thirdparty%2FChart.js.git Rename addEventListener and removeEventListener (#6046) Prevent conflict with `window.addEventListener` and `window.removeEventListener` (global scope). --- diff --git a/src/platforms/platform.dom.js b/src/platforms/platform.dom.js index 01a46174d..053db20d2 100644 --- a/src/platforms/platform.dom.js +++ b/src/platforms/platform.dom.js @@ -124,11 +124,11 @@ var supportsEventListenerOptions = (function() { // https://github.com/chartjs/Chart.js/issues/4287 var eventListenerOptions = supportsEventListenerOptions ? {passive: true} : false; -function addEventListener(node, type, listener) { +function addListener(node, type, listener) { node.addEventListener(type, listener, eventListenerOptions); } -function removeEventListener(node, type, listener) { +function removeListener(node, type, listener) { node.removeEventListener(type, listener, eventListenerOptions); } @@ -223,8 +223,8 @@ function createResizer(handler) { handler(); }; - addEventListener(expand, 'scroll', onScroll.bind(expand, 'expand')); - addEventListener(shrink, 'scroll', onScroll.bind(shrink, 'shrink')); + addListener(expand, 'scroll', onScroll.bind(expand, 'expand')); + addListener(shrink, 'scroll', onScroll.bind(shrink, 'shrink')); return resizer; } @@ -239,7 +239,7 @@ function watchForRender(node, handler) { }; helpers.each(ANIMATION_START_EVENTS, function(type) { - addEventListener(node, type, proxy); + addListener(node, type, proxy); }); // #4737: Chrome might skip the CSS animation when the CSS_RENDER_MONITOR class @@ -258,7 +258,7 @@ function unwatchForRender(node) { if (proxy) { helpers.each(ANIMATION_START_EVENTS, function(type) { - removeEventListener(node, type, proxy); + removeListener(node, type, proxy); }); delete expando.renderProxy; @@ -429,7 +429,7 @@ module.exports = { listener(fromNativeEvent(event, chart)); }; - addEventListener(canvas, type, proxy); + addListener(canvas, type, proxy); }, removeEventListener: function(chart, type, listener) { @@ -447,7 +447,7 @@ module.exports = { return; } - removeEventListener(canvas, type, proxy); + removeListener(canvas, type, proxy); } }; @@ -462,7 +462,7 @@ module.exports = { * @todo remove at version 3 * @private */ -helpers.addEvent = addEventListener; +helpers.addEvent = addListener; /** * Provided for backward compatibility, use EventTarget.removeEventListener instead. @@ -473,4 +473,4 @@ helpers.addEvent = addEventListener; * @todo remove at version 3 * @private */ -helpers.removeEvent = removeEventListener; +helpers.removeEvent = removeListener;