From 0d6a459b60cdcd3fb552bcba546a40218b86a9fa Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Tue, 29 Mar 2022 09:49:17 -0400 Subject: [PATCH] Discard duplicate lines when merging imported directives Related feedback: - https://www.reddit.com/r/uBlockOrigin/comments/tqwl4s/import_of_the_reliable_sites/ --- src/js/whitelist.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/js/whitelist.js b/src/js/whitelist.js index afd07bec8..e18e14afa 100644 --- a/src/js/whitelist.js +++ b/src/js/whitelist.js @@ -178,9 +178,11 @@ const handleImportFilePicker = function() { const fr = new FileReader(); fr.onload = ev => { if ( ev.type !== 'load' ) { return; } - setEditorText( - [ getEditorText().trim(), fr.result.trim() ].join('\n').trim() + const content = uBlockDashboard.mergeNewLines( + getEditorText().trim(), + fr.result.trim() ); + setEditorText(content); }; fr.readAsText(file); };