diff --git a/package.json b/package.json index 3094b9ec..09448187 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@adguard/scriptlets", - "version": "1.9.80", + "version": "1.9.81", "description": "AdGuard's JavaScript library of Scriptlets and Redirect resources", "scripts": { "build": "babel-node -x .js,.ts scripts/build.js", diff --git a/scripts/compatibility-table.json b/scripts/compatibility-table.json index 188d3270..6da6fcbc 100644 --- a/scripts/compatibility-table.json +++ b/scripts/compatibility-table.json @@ -21,15 +21,15 @@ }, { "adg": "adjust-setInterval", - "ubo": "nano-setInterval-booster.js (nano-sib.js)" + "ubo": "adjust-setInterval.js (nano-setInterval-booster.js, nano-sib.js)" }, { "adg": "adjust-setTimeout", - "ubo": "nano-setTimeout-booster.js (nano-stb.js)" + "ubo": "adjust-setTimeout.js (nano-setTimeout-booster.js, nano-stb.js)" }, { "adg": "close-window", - "ubo": "window-close-if.js" + "ubo": "close-window.js (window-close-if.js)" }, { "adg": "debug-current-inline-script" @@ -116,7 +116,7 @@ }, { "adg": "prevent-refresh", - "ubo": "refresh-defuser.js" + "ubo": "prevent-refresh.js (refresh-defuser.js)" }, { "adg": "prevent-requestAnimationFrame", @@ -292,6 +292,12 @@ }, { "ubo": "trusted-replace-xhr-response.js" + }, + { + "ubo": "multiup.js" + }, + { + "ubo": "prevent-canvas.js" } ], "redirects": [ @@ -500,4 +506,4 @@ "ubo": "noop-0.5s.mp3" } ] -} \ No newline at end of file +} diff --git a/src/scriptlets/adjust-setInterval.js b/src/scriptlets/adjust-setInterval.js index 1236a38b..4af5f9fe 100644 --- a/src/scriptlets/adjust-setInterval.js +++ b/src/scriptlets/adjust-setInterval.js @@ -108,8 +108,11 @@ adjustSetInterval.names = [ 'ubo-nano-setInterval-booster.js', 'nano-sib.js', 'ubo-nano-sib.js', + 'adjust-setInterval.js', + 'ubo-adjust-setInterval.js', 'ubo-nano-setInterval-booster', 'ubo-nano-sib', + 'ubo-adjust-setInterval', ]; adjustSetInterval.injections = [ diff --git a/src/scriptlets/adjust-setTimeout.js b/src/scriptlets/adjust-setTimeout.js index 72bd36d9..9fd3d816 100644 --- a/src/scriptlets/adjust-setTimeout.js +++ b/src/scriptlets/adjust-setTimeout.js @@ -106,10 +106,13 @@ export function adjustSetTimeout(source, matchCallback, matchDelay, boost) { adjustSetTimeout.names = [ 'adjust-setTimeout', // aliases are needed for matching the related scriptlet converted into our syntax + 'adjust-setTimeout.js', + 'ubo-adjust-setTimeout.js', 'nano-setTimeout-booster.js', 'ubo-nano-setTimeout-booster.js', 'nano-stb.js', 'ubo-nano-stb.js', + 'ubo-adjust-setTimeout', 'ubo-nano-setTimeout-booster', 'ubo-nano-stb', ]; diff --git a/src/scriptlets/close-window.js b/src/scriptlets/close-window.js index 7126525a..4c837d7e 100644 --- a/src/scriptlets/close-window.js +++ b/src/scriptlets/close-window.js @@ -85,9 +85,13 @@ export function forceWindowClose(source, path = '') { forceWindowClose.names = [ 'close-window', + // aliases are needed for matching the related scriptlet converted into our syntax 'window-close-if.js', 'ubo-window-close-if.js', 'ubo-window-close-if', + 'close-window.js', + 'ubo-close-window.js', + 'ubo-close-window', ]; forceWindowClose.injections = [ diff --git a/src/scriptlets/prevent-refresh.js b/src/scriptlets/prevent-refresh.js index 3e93100c..68882ed2 100644 --- a/src/scriptlets/prevent-refresh.js +++ b/src/scriptlets/prevent-refresh.js @@ -120,9 +120,12 @@ preventRefresh.names = [ // Aliases are needed for matching the related scriptlet converted into our syntax // These are used by UBO rules syntax // https://github.com/gorhill/uBlock/wiki/Resources-Library#general-purpose-scriptlets + 'prevent-refresh.js', 'refresh-defuser.js', 'refresh-defuser', // Prefix 'ubo-' is required to run converted rules + 'ubo-prevent-refresh.js', + 'ubo-prevent-refresh', 'ubo-refresh-defuser.js', 'ubo-refresh-defuser', ]; diff --git a/wiki/compatibility-table.md b/wiki/compatibility-table.md index be65800f..4db6dd84 100644 --- a/wiki/compatibility-table.md +++ b/wiki/compatibility-table.md @@ -12,9 +12,9 @@ | [abort-on-property-read](../wiki/about-scriptlets.md#abort-on-property-read) | abort-on-property-read.js (aopr.js) | abort-on-property-read | | [abort-on-property-write](../wiki/about-scriptlets.md#abort-on-property-write) | abort-on-property-write.js (aopw.js) | abort-on-property-write | | [abort-on-stack-trace](../wiki/about-scriptlets.md#abort-on-stack-trace) | abort-on-stack-trace.js (aost.js) | | -| [adjust-setInterval](../wiki/about-scriptlets.md#adjust-setInterval) | nano-setInterval-booster.js (nano-sib.js) | | -| [adjust-setTimeout](../wiki/about-scriptlets.md#adjust-setTimeout) | nano-setTimeout-booster.js (nano-stb.js) | | -| [close-window](../wiki/about-scriptlets.md#close-window) | window-close-if.js | | +| [adjust-setInterval](../wiki/about-scriptlets.md#adjust-setInterval) | adjust-setInterval.js (nano-setInterval-booster.js, nano-sib.js) | | +| [adjust-setTimeout](../wiki/about-scriptlets.md#adjust-setTimeout) | adjust-setTimeout.js (nano-setTimeout-booster.js, nano-stb.js) | | +| [close-window](../wiki/about-scriptlets.md#close-window) | close-window.js (window-close-if.js) | | | [debug-current-inline-script](../wiki/about-scriptlets.md#debug-current-inline-script) | | | | [debug-on-property-read](../wiki/about-scriptlets.md#debug-on-property-read) | | | | [debug-on-property-write](../wiki/about-scriptlets.md#debug-on-property-write) | | | @@ -38,7 +38,7 @@ | [prevent-fetch](../wiki/about-scriptlets.md#prevent-fetch) | no-fetch-if.js (prevent-fetch.js) | | | [prevent-xhr](../wiki/about-scriptlets.md#prevent-xhr) | no-xhr-if.js (prevent-xhr.js) | | | [prevent-popads-net](../wiki/about-scriptlets.md#prevent-popads-net) | | | -| [prevent-refresh](../wiki/about-scriptlets.md#prevent-refresh) | refresh-defuser.js | | +| [prevent-refresh](../wiki/about-scriptlets.md#prevent-refresh) | prevent-refresh.js (refresh-defuser.js) | | | [prevent-requestAnimationFrame](../wiki/about-scriptlets.md#prevent-requestAnimationFrame) | no-requestAnimationFrame-if.js (norafif.js, prevent-requestAnimationFrame.js) | | | [prevent-setInterval](../wiki/about-scriptlets.md#prevent-setInterval) | no-setInterval-if.js (nosiif.js, prevent-setInterval.js, setInterval-defuser.js) | | | [prevent-setTimeout](../wiki/about-scriptlets.md#prevent-setTimeout) | no-setTimeout-if.js (nostif.js, prevent-setTimeout.js, setTimeout-defuser.js) | | @@ -92,6 +92,8 @@ | | json-prune-fetch-response.js | | | | json-prune-xhr-response.js | | | | trusted-replace-xhr-response.js | | +| | multiup.js | | +| | prevent-canvas.js | | ## Redirects compatibility table