Skip to content

Commit de45d19

Browse files
author
Atlassian Bamboo
committed
deploy: update dist v1.9.1
1 parent 36fc030 commit de45d19

File tree

10 files changed

+2698
-532
lines changed

10 files changed

+2698
-532
lines changed

‎dist/build.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=1.8.2
1+
version=1.9.1

‎dist/redirect-files/google-analytics-ga.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,16 @@
106106
function noopFunc() {}
107107
function logMessage(source, message) {
108108
let forced = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
109+
let convertMessageToString = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
109110
const name = source.name, ruleText = source.ruleText, verbose = source.verbose;
110111
if (!forced && !verbose) {
111112
return;
112113
}
114+
const nativeConsole = console.log;
115+
if (!convertMessageToString) {
116+
nativeConsole("".concat(name, ":"), message);
117+
return;
118+
}
113119
let messageStr = "".concat(name, ": ").concat(message);
114120
if (ruleText) {
115121
const RULE_MARKER = "#%#//scriptlet";
@@ -119,7 +125,7 @@
119125
messageStr += "; cannot apply rule: ".concat(ruleWithoutDomains);
120126
}
121127
}
122-
console.log(messageStr);
128+
nativeConsole(messageStr);
123129
}
124130
const updatedArgs = args ? [].concat(source).concat(args) : [ source ];
125131
try {

‎dist/redirect-files/google-ima3.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,10 +578,16 @@
578578
function noopFunc() {}
579579
function logMessage(source, message) {
580580
let forced = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
581+
let convertMessageToString = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
581582
const name = source.name, ruleText = source.ruleText, verbose = source.verbose;
582583
if (!forced && !verbose) {
583584
return;
584585
}
586+
const nativeConsole = console.log;
587+
if (!convertMessageToString) {
588+
nativeConsole("".concat(name, ":"), message);
589+
return;
590+
}
585591
let messageStr = "".concat(name, ": ").concat(message);
586592
if (ruleText) {
587593
const RULE_MARKER = "#%#//scriptlet";
@@ -591,7 +597,7 @@
591597
messageStr += "; cannot apply rule: ".concat(ruleWithoutDomains);
592598
}
593599
}
594-
console.log(messageStr);
600+
nativeConsole(messageStr);
595601
}
596602
const updatedArgs = args ? [].concat(source).concat(args) : [ source ];
597603
try {

‎dist/redirect-files/noeval.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,16 @@
3737
}
3838
function logMessage(source, message) {
3939
let forced = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
40+
let convertMessageToString = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
4041
const name = source.name, ruleText = source.ruleText, verbose = source.verbose;
4142
if (!forced && !verbose) {
4243
return;
4344
}
45+
const nativeConsole = console.log;
46+
if (!convertMessageToString) {
47+
nativeConsole("".concat(name, ":"), message);
48+
return;
49+
}
4450
let messageStr = "".concat(name, ": ").concat(message);
4551
if (ruleText) {
4652
const RULE_MARKER = "#%#//scriptlet";
@@ -50,7 +56,7 @@
5056
messageStr += "; cannot apply rule: ".concat(ruleWithoutDomains);
5157
}
5258
}
53-
console.log(messageStr);
59+
nativeConsole(messageStr);
5460
}
5561
const updatedArgs = args ? [].concat(source).concat(args) : [ source ];
5662
try {

‎dist/redirects.json‎

Lines changed: 4 additions & 3 deletions
Large diffs are not rendered by default.

‎dist/redirects.yml‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# AdGuard Scriptlets (Redirects Source)
3-
# Version 1.8.2
3+
# Version 1.9.1
44
#
55
- title: 1x1-transparent.gif
66
description: |-
@@ -86,6 +86,7 @@
8686
||example.org/style.css$stylesheet,redirect=noopcss
8787
```
8888
aliases:
89+
- noop.css
8990
- blank-css
9091
file: noopcss.css
9192
contentType: text/css
@@ -1272,10 +1273,16 @@
12721273
function noopFunc() {}
12731274
function logMessage(source, message) {
12741275
let forced = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
1276+
let convertMessageToString = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
12751277
const name = source.name, ruleText = source.ruleText, verbose = source.verbose;
12761278
if (!forced && !verbose) {
12771279
return;
12781280
}
1281+
const nativeConsole = console.log;
1282+
if (!convertMessageToString) {
1283+
nativeConsole("".concat(name, ":"), message);
1284+
return;
1285+
}
12791286
let messageStr = "".concat(name, ": ").concat(message);
12801287
if (ruleText) {
12811288
const RULE_MARKER = "#%#//scriptlet";
@@ -1285,7 +1292,7 @@
12851292
messageStr += "; cannot apply rule: ".concat(ruleWithoutDomains);
12861293
}
12871294
}
1288-
console.log(messageStr);
1295+
nativeConsole(messageStr);
12891296
}
12901297
const updatedArgs = args ? [].concat(source).concat(args) : [ source ];
12911298
try {
@@ -2022,10 +2029,16 @@
20222029
function noopFunc() {}
20232030
function logMessage(source, message) {
20242031
let forced = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
2032+
let convertMessageToString = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
20252033
const name = source.name, ruleText = source.ruleText, verbose = source.verbose;
20262034
if (!forced && !verbose) {
20272035
return;
20282036
}
2037+
const nativeConsole = console.log;
2038+
if (!convertMessageToString) {
2039+
nativeConsole("".concat(name, ":"), message);
2040+
return;
2041+
}
20292042
let messageStr = "".concat(name, ": ").concat(message);
20302043
if (ruleText) {
20312044
const RULE_MARKER = "#%#//scriptlet";
@@ -2035,7 +2048,7 @@
20352048
messageStr += "; cannot apply rule: ".concat(ruleWithoutDomains);
20362049
}
20372050
}
2038-
console.log(messageStr);
2051+
nativeConsole(messageStr);
20392052
}
20402053
const updatedArgs = args ? [].concat(source).concat(args) : [ source ];
20412054
try {
@@ -2986,10 +2999,16 @@
29862999
}
29873000
function logMessage(source, message) {
29883001
let forced = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
3002+
let convertMessageToString = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
29893003
const name = source.name, ruleText = source.ruleText, verbose = source.verbose;
29903004
if (!forced && !verbose) {
29913005
return;
29923006
}
3007+
const nativeConsole = console.log;
3008+
if (!convertMessageToString) {
3009+
nativeConsole("".concat(name, ":"), message);
3010+
return;
3011+
}
29933012
let messageStr = "".concat(name, ": ").concat(message);
29943013
if (ruleText) {
29953014
const RULE_MARKER = "#%#//scriptlet";
@@ -2999,7 +3018,7 @@
29993018
messageStr += "; cannot apply rule: ".concat(ruleWithoutDomains);
30003019
}
30013020
}
3002-
console.log(messageStr);
3021+
nativeConsole(messageStr);
30033022
}
30043023
const updatedArgs = args ? [].concat(source).concat(args) : [ source ];
30053024
try {

‎dist/scriptlets.corelibs.json‎

Lines changed: 48 additions & 39 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)