From 85b89fbe632b739e2e76cf71a78dcc83304bbffa Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Sun, 26 May 2019 08:03:44 -0400
Subject: [PATCH] Fix broken import-from-file in Whitelist pane

Related discussion:
- https://www.reddit.com/r/uBlockOrigin/comments/bt2d1f/
---
 src/js/whitelist.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/js/whitelist.js b/src/js/whitelist.js
index 9ba00fea7..66f48a8eb 100644
--- a/src/js/whitelist.js
+++ b/src/js/whitelist.js
@@ -157,19 +157,19 @@ const renderWhitelist = function() {
 /******************************************************************************/
 
 const handleImportFilePicker = function() {
-    const fileReaderOnLoadHandler = ( ) => {
-        cmEditor.setValue(
-            [
-                cmEditor.getValue().trim(),
-                this.result.trim()
-            ].join('\n').trim()
-        );
-    };
     const file = this.files[0];
     if ( file === undefined || file.name === '' ) { return; }
     if ( file.type.indexOf('text') !== 0 ) { return; }
     const fr = new FileReader();
-    fr.onload = fileReaderOnLoadHandler;
+    fr.onload = ev => {
+        if ( ev.type !== 'load' ) { return; }
+        cmEditor.setValue(
+            [
+                cmEditor.getValue().trim(),
+                fr.result.trim()
+            ].join('\n').trim()
+        );
+    };
     fr.readAsText(file);
 };