From c223a8cd39fb5965834c5bc8a29b878313620cae Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Mon, 8 Apr 2024 20:48:58 -0400 Subject: [PATCH] Fix regression breaking import of `file://` lists Related issue: https://github.com/uBlockOrigin/uBlock-issues/issues/3199 --- src/js/3p-filters.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/js/3p-filters.js b/src/js/3p-filters.js index 2d1a5dfb09ce4..e551dcfd0f32e 100644 --- a/src/js/3p-filters.js +++ b/src/js/3p-filters.js @@ -559,21 +559,20 @@ const selectFilterLists = async ( ) => { const textarea = qs$('#lists .listEntry[data-role="import"].expanded textarea'); if ( textarea === null ) { return ''; } const lists = listsetDetails.available; - const lines = textarea.value.split(/\s+\n|\s+/); + const lines = textarea.value.split(/\s+/); const after = []; for ( const line of lines ) { + after.push(line); if ( /^https?:\/\//.test(line) === false ) { continue; } for ( const [ listkey, list ] of Object.entries(lists) ) { if ( list.content !== 'filters' ) { continue; } if ( list.contentURL === undefined ) { continue; } - if ( list.contentURL.includes(line) === false ) { - after.push(line); - continue; - } + if ( list.contentURL.includes(line) === false ) { continue; } const groupkey = list.group2 || list.group; const listEntry = qs$(`[data-key="${groupkey}"] [data-key="${listkey}"]`); if ( listEntry === null ) { break; } toggleFilterList(listEntry, true); + after.pop(); break; } }