fix: destroying event listener on window

frappe · Aug 11, 2019 · 92674f9 · 92674f9
1 parent 884c52c
commit 92674f9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -261,7 +261,7 @@ <h6>Available options</h6>
   chart.export();
 
   // Unbind window-resize events
-  chart.unbindWindowEvents();
+  chart.destroy();
 
 </code></pre>
     </section>

diff --git a/src/js/charts/BaseChart.js b/src/js/charts/BaseChart.js
@@ -7,8 +7,6 @@ import { getColor, isValidColor } from '../utils/colors';
 import { runSMILAnimation } from '../utils/animation';
 import { downloadFile, prepareForExport } from '../utils/export';
 
-let BOUND_DRAW_FN;
-
 export default class BaseChart {
 	constructor(parent, options) {
 
@@ -90,18 +88,14 @@ export default class BaseChart {
 		this.height = height - getExtraHeight(this.measures);
 
 		// Bind window events
-		BOUND_DRAW_FN = this.boundDrawFn.bind(this);
-		window.addEventListener('resize', BOUND_DRAW_FN);
-		window.addEventListener('orientationchange', this.boundDrawFn.bind(this));
-	}
-
-	boundDrawFn() {
-		this.draw(true);
+		this.boundDrawFn = () => this.draw(true);
+		window.addEventListener('resize', this.boundDrawFn);
+		window.addEventListener('orientationchange', this.boundDrawFn);
 	}
 
-	unbindWindowEvents() {
-		window.removeEventListener('resize', BOUND_DRAW_FN);
-		window.removeEventListener('orientationchange', this.boundDrawFn.bind(this));
+	destroy() {
+		window.removeEventListener('resize', this.boundDrawFn);
+		window.removeEventListener('orientationchange', this.boundDrawFn);
 	}
 
 	// Has to be called manually