Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Commit

Permalink
cherry pick
Browse files Browse the repository at this point in the history
  • Loading branch information
jspenguin2017 committed Jul 16, 2020
1 parent bb0da20 commit c70a42b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
11 changes: 10 additions & 1 deletion patches/90_1_cherry_pick_fixes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,18 @@ index dbf55b72..4d0fda69 100644
node.setAttribute('style', attr + 'display:none!important;');
}
diff --git a/src/js/redirect-engine.js b/src/js/redirect-engine.js
index f2f67e83..5c550852 100644
index f2f67e83..c9c7a6b0 100644
--- a/src/js/redirect-engine.js
+++ b/src/js/redirect-engine.js
@@ -469,7 +469,7 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
let type,
redirect = '',
srchns = [];
- for ( const option of matches[3].split(',') ) {
+ for ( const option of matches[3].trim().split(/,/) ) {
if ( option.startsWith('redirect=') ) {
redirect = option.slice(9);
continue;
@@ -552,7 +552,7 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {

/******************************************************************************/
Expand Down
1 change: 1 addition & 0 deletions patches/README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ filters automatic comment template.
`90_0_assets_migration.patch`: Legacy assets migration.

`90_1_cherry_pick_fixes.patch`: Cherry-pick of the following commits:
- https://github.com/gorhill/uBlock/commit/d49a9dce66de6c3af1c31b9384293cddd96eb574
- https://github.com/gorhill/uBlock/commit/a5ba668c382a3be0ba41ce0f0a69ebb090c260a5
- https://github.com/gorhill/uBlock/commit/64cfc5779d87612f87bd5f9bd5581704d5795b64
- https://github.com/gorhill/uBlock/commit/cb5437b1619ed4e84b7b1319b400f44f98df117a
Expand Down
2 changes: 1 addition & 1 deletion term/data.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const assert = require("assert");

// ----------------------------------------------------------------------------------------------------------------- //

exports.version = "1.0.0.151";
exports.version = "1.0.0.152";

exports.based_on = [
"uBlock Origin",
Expand Down

0 comments on commit c70a42b

Please sign in to comment.