Skip to content

Commit c002263

Browse files
committed
hotfix: hotfix for #1267
1 parent 2d69dfd commit c002263

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

config/defaults.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { blockers } from '../plugins/adblocker/blocker-types';
2+
13
export interface WindowSizeConfig {
24
width: number;
35
height: number;
@@ -72,7 +74,7 @@ const defaultConfig = {
7274
'adblocker': {
7375
enabled: true,
7476
cache: true,
75-
blocker: 'With blocklists',
77+
blocker: blockers.InPlayer as string,
7678
additionalBlockLists: [], // Additional list of filters, e.g "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt"
7779
disableDefaultLists: false,
7880
},

plugins/adblocker/blocker-types.ts

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export const blockers = {
2+
WithBlocklists: 'With blocklists',
3+
InPlayer: 'In player',
4+
} as const;

plugins/adblocker/config.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
/* eslint-disable @typescript-eslint/await-thenable */
22
/* renderer */
33

4+
import { blockers } from './blocker-types';
5+
46
import { PluginConfig } from '../../config/dynamic';
57

68
const config = new PluginConfig('adblocker', { enableFront: true });
79

8-
export const blockers = {
9-
WithBlocklists: 'With blocklists',
10-
InPlayer: 'In player',
11-
};
12-
1310
export const shouldUseBlocklists = async () => await config.get('blocker') !== blockers.InPlayer;
1411

1512
export default Object.assign(config, {

plugins/adblocker/menu.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import config, { blockers } from './config';
1+
import config from './config';
2+
3+
import { blockers } from './blocker-types';
24

35
import { MenuTemplate } from '../../menu';
46

plugins/adblocker/preload.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import config, { blockers } from './config';
1+
import config from './config';
22
import inject from './inject';
33
import injectCliqzPreload from './inject-cliqz-preload';
44

5+
import { blockers } from './blocker-types';
6+
57
export default async () => {
68
if (await config.shouldUseBlocklists()) {
79
// Preload adblocker to inject scripts/styles

0 commit comments

Comments
 (0)