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 merging of uncommitted filters

Browse source 
Related issue:
https://github.com/uBlockOrigin/uBlock-issues/issues/3912
This commit is contained in:
Raymond Hill 2026-01-10 12:38:27 -05:00
parent 41ced43f03
commit c8004c4b02
No known key found for this signature in database
GPG key ID: F5630CAE62A14316
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/js/1p-filters.js
View file

@ -197,7 +197,7 @@ function threeWayMerge(newContent) {
/******************************************************************************/
async function renderUserFilters(merge = false) {
async function renderUserFilters() {
const details = await vAPI.messaging.send('dashboard', {
what: 'readUserFilters',
});
@ -208,15 +208,8 @@ async function renderUserFilters(merge = false) {
qs$('#enableMyFilters input').checked = details.enabled;
qs$('#trustMyFilters input').checked = details.trusted;
const newContent = details.content.trim();
if ( merge && self.hasUnsavedData() ) {
setEditorText(threeWayMerge(newContent));
userFiltersChanged({ changed: true });
} else {
setEditorText(newContent);
userFiltersChanged({ changed: false });
}
setEditorText(details.content.trim());
userFiltersChanged({ changed: false });
rememberCurrentState();
}
@ -365,7 +358,13 @@ dom.on('#trustMyFilters input', 'change', userFiltersChanged);
cmEditor.startOperation();
const scroll = cmEditor.getScrollInfo();
const selections = cmEditor.listSelections();
renderUserFilters(true).then(( ) => {
const shouldMerge = self.hasUnsavedData();
const beforeContent = getEditorText();
renderUserFilters().then(( ) => {
if ( shouldMerge ) {
setEditorText(threeWayMerge(beforeContent));
userFiltersChanged({ changed: true });
}
cmEditor.clearHistory();
cmEditor.setSelection(selections[0].anchor, selections[0].head);
cmEditor.scrollTo(scroll.left, scroll.top);