prehistoric-systems/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2026-03-11 09:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix broken import-from-file in Whitelist pane

Browse source 
Related discussion:
- https://www.reddit.com/r/uBlockOrigin/comments/bt2d1f/
This commit is contained in:
Raymond Hill 2019-05-26 08:03:44 -04:00
parent 44fd5b1473
commit 85b89fbe63
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/js/whitelist.js
View file

@ -157,19 +157,19 @@ const renderWhitelist = function() {
/******************************************************************************/ /******************************************************************************/
const handleImportFilePicker = function() { const handleImportFilePicker = function() {
const fileReaderOnLoadHandler = ( ) => {
cmEditor.setValue(
[
cmEditor.getValue().trim(),
this.result.trim()
].join('\n').trim()
);
};
const file = this.files[0]; const file = this.files[0];
if ( file === undefined || file.name === '' ) { return; } if ( file === undefined || file.name === '' ) { return; }
if ( file.type.indexOf('text') !== 0 ) { return; } if ( file.type.indexOf('text') !== 0 ) { return; }
const fr = new FileReader(); 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); fr.readAsText(file);
}; };