Skip to content

Commit

Permalink
deploy: update dist v1.9.37
Browse files Browse the repository at this point in the history
  • Loading branch information
Atlassian Bamboo committed Jun 6, 2023
1 parent 77412eb commit a55b61f
Show file tree
Hide file tree
Showing 36 changed files with 11,274 additions and 6,070 deletions.
2 changes: 1 addition & 1 deletion dist/build.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=1.9.7
version=1.9.37
4 changes: 2 additions & 2 deletions dist/redirect-files/amazon-apstag.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
const AG_SCRIPTLET_MARKER = "#%#//";
const UBO_SCRIPTLET_MARKER = "##+js";
let ruleStartIndex;
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
} else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
}
const rulePart = source.ruleText.slice(ruleStartIndex);
Expand Down
4 changes: 2 additions & 2 deletions dist/redirect-files/ati-smarttag.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@
const AG_SCRIPTLET_MARKER = "#%#//";
const UBO_SCRIPTLET_MARKER = "##+js";
let ruleStartIndex;
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
} else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
}
const rulePart = source.ruleText.slice(ruleStartIndex);
Expand Down
4 changes: 2 additions & 2 deletions dist/redirect-files/click2load.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
let matchedData;
let queryStr = rawQueryStr.substring(1);
while (matchedData = pattern.exec(queryStr)) {
if (neededParams.indexOf(matchedData[1]) > -1) {
if (neededParams.includes(matchedData[1])) {
res[matchedData[1]] = matchedData[2];
}
queryStr = queryStr.substring(matchedData[0]);
Expand Down Expand Up @@ -236,7 +236,7 @@
const FRAME_MARKER = 'frame';
const SUBDOCUMENT_MARKER = 'subdocument';
const ruleModifiers = substringAfter(rule, '$').split(',');
return ruleModifiers.indexOf(FRAME_MARKER) > -1 || ruleModifiers.indexOf(SUBDOCUMENT_MARKER) > -1;
return ruleModifiers.includes(FRAME_MARKER) || ruleModifiers.includes(SUBDOCUMENT_MARKER);
};
const isInsideFrame = function isInsideFrame() {
return window.self !== window.top;
Expand Down
4 changes: 2 additions & 2 deletions dist/redirect-files/didomi-loader.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@
const AG_SCRIPTLET_MARKER = "#%#//";
const UBO_SCRIPTLET_MARKER = "##+js";
let ruleStartIndex;
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
} else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
}
const rulePart = source.ruleText.slice(ruleStartIndex);
Expand Down
4 changes: 2 additions & 2 deletions dist/redirect-files/fingerprintjs2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
const AG_SCRIPTLET_MARKER = "#%#//";
const UBO_SCRIPTLET_MARKER = "##+js";
let ruleStartIndex;
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
} else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
}
const rulePart = source.ruleText.slice(ruleStartIndex);
Expand Down
4 changes: 2 additions & 2 deletions dist/redirect-files/fingerprintjs3.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
const AG_SCRIPTLET_MARKER = "#%#//";
const UBO_SCRIPTLET_MARKER = "##+js";
let ruleStartIndex;
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
} else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
}
const rulePart = source.ruleText.slice(ruleStartIndex);
Expand Down
4 changes: 2 additions & 2 deletions dist/redirect-files/gemius.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
const AG_SCRIPTLET_MARKER = "#%#//";
const UBO_SCRIPTLET_MARKER = "##+js";
let ruleStartIndex;
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
} else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
}
const rulePart = source.ruleText.slice(ruleStartIndex);
Expand Down
17 changes: 4 additions & 13 deletions dist/redirect-files/google-analytics-ga.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@
const AG_SCRIPTLET_MARKER = "#%#//";
const UBO_SCRIPTLET_MARKER = "##+js";
let ruleStartIndex;
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
} else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
}
const rulePart = source.ruleText.slice(ruleStartIndex);
Expand All @@ -107,7 +107,7 @@
function logMessage(source, message) {
let forced = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
let convertMessageToString = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
const name = source.name, ruleText = source.ruleText, verbose = source.verbose;
const name = source.name, verbose = source.verbose;
if (!forced && !verbose) {
return;
}
Expand All @@ -116,16 +116,7 @@
nativeConsole("".concat(name, ":"), message);
return;
}
let messageStr = "".concat(name, ": ").concat(message);
if (ruleText) {
const RULE_MARKER = "#%#//scriptlet";
const markerIdx = ruleText.indexOf(RULE_MARKER);
if (markerIdx > -1) {
const ruleWithoutDomains = ruleText.slice(markerIdx, ruleText.length);
messageStr += "; cannot apply rule: ".concat(ruleWithoutDomains);
}
}
nativeConsole(messageStr);
nativeConsole("".concat(name, ": ").concat(message));
}
const updatedArgs = args ? [].concat(source).concat(args) : [ source ];
try {
Expand Down
4 changes: 2 additions & 2 deletions dist/redirect-files/google-analytics.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@
const AG_SCRIPTLET_MARKER = "#%#//";
const UBO_SCRIPTLET_MARKER = "##+js";
let ruleStartIndex;
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
} else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
}
const rulePart = source.ruleText.slice(ruleStartIndex);
Expand Down
17 changes: 4 additions & 13 deletions dist/redirect-files/google-ima3.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -557,9 +557,9 @@
const AG_SCRIPTLET_MARKER = "#%#//";
const UBO_SCRIPTLET_MARKER = "##+js";
let ruleStartIndex;
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
} else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
}
const rulePart = source.ruleText.slice(ruleStartIndex);
Expand All @@ -579,7 +579,7 @@
function logMessage(source, message) {
let forced = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
let convertMessageToString = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
const name = source.name, ruleText = source.ruleText, verbose = source.verbose;
const name = source.name, verbose = source.verbose;
if (!forced && !verbose) {
return;
}
Expand All @@ -588,16 +588,7 @@
nativeConsole("".concat(name, ":"), message);
return;
}
let messageStr = "".concat(name, ": ").concat(message);
if (ruleText) {
const RULE_MARKER = "#%#//scriptlet";
const markerIdx = ruleText.indexOf(RULE_MARKER);
if (markerIdx > -1) {
const ruleWithoutDomains = ruleText.slice(markerIdx, ruleText.length);
messageStr += "; cannot apply rule: ".concat(ruleWithoutDomains);
}
}
nativeConsole(messageStr);
nativeConsole("".concat(name, ": ").concat(message));
}
const updatedArgs = args ? [].concat(source).concat(args) : [ source ];
try {
Expand Down
6 changes: 3 additions & 3 deletions dist/redirect-files/googlesyndication-adsbygoogle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
const childNodesQuantity = adElemChildNodes.length;
let areIframesDefined = false;
if (childNodesQuantity > 0) {
areIframesDefined = childNodesQuantity === 2 && adElemChildNodes[0].nodeName.toLowerCase() === "iframe" && adElemChildNodes[0].id.indexOf(ASWIFT_IFRAME_MARKER) > -1 && adElemChildNodes[1].nodeName.toLowerCase() === "iframe" && adElemChildNodes[1].id.indexOf(GOOGLE_ADS_IFRAME_MARKER) > -1;
areIframesDefined = childNodesQuantity === 2 && adElemChildNodes[0].nodeName.toLowerCase() === "iframe" && adElemChildNodes[0].id.includes(ASWIFT_IFRAME_MARKER) && adElemChildNodes[1].nodeName.toLowerCase() === "iframe" && adElemChildNodes[1].id.includes(GOOGLE_ADS_IFRAME_MARKER);
}
if (!areIframesDefined) {
adElems[i].setAttribute(statusAttrName, "done");
Expand Down Expand Up @@ -65,9 +65,9 @@
const AG_SCRIPTLET_MARKER = "#%#//";
const UBO_SCRIPTLET_MARKER = "##+js";
let ruleStartIndex;
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
} else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
}
const rulePart = source.ruleText.slice(ruleStartIndex);
Expand Down
16 changes: 8 additions & 8 deletions dist/redirect-files/googletagservices-gpt.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
f.setAttribute("height", 0);
f.setAttribute("data-load-complete", true);
f.setAttribute("data-google-container-id", true);
f.setAttribute("sandbox", true);
f.setAttribute("sandbox", "");
node.appendChild(f);
}
};
Expand Down Expand Up @@ -108,16 +108,16 @@
return [ v ];
}
try {
return [ Array.prototype.flat.call(v)[0] ];
return Array.prototype.flat.call(v);
} catch (_unused) {}
return [];
};
const updateTargeting = function updateTargeting(targeting, map) {
if (typeof map === "object") {
const entries = Object.entries(map || {});
for (var _i = 0, _entries = entries; _i < _entries.length; _i++) {
const _entries$_i = slicedToArray(_entries[_i], 2), k = _entries$_i[0], v = _entries$_i[1];
targeting.set(k, getTargetingValue(v));
for (const key in map) {
if (Object.prototype.hasOwnProperty.call(map, key)) {
targeting.set(key, getTargetingValue(map[key]));
}
}
}
};
Expand Down Expand Up @@ -382,9 +382,9 @@
const AG_SCRIPTLET_MARKER = "#%#//";
const UBO_SCRIPTLET_MARKER = "##+js";
let ruleStartIndex;
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
} else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
}
const rulePart = source.ruleText.slice(ruleStartIndex);
Expand Down
4 changes: 2 additions & 2 deletions dist/redirect-files/matomo.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
const AG_SCRIPTLET_MARKER = "#%#//";
const UBO_SCRIPTLET_MARKER = "##+js";
let ruleStartIndex;
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
} else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
}
const rulePart = source.ruleText.slice(ruleStartIndex);
Expand Down
4 changes: 2 additions & 2 deletions dist/redirect-files/metrika-yandex-tag.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@
const AG_SCRIPTLET_MARKER = "#%#//";
const UBO_SCRIPTLET_MARKER = "##+js";
let ruleStartIndex;
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
} else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
}
const rulePart = source.ruleText.slice(ruleStartIndex);
Expand Down
4 changes: 2 additions & 2 deletions dist/redirect-files/metrika-yandex-watch.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
const AG_SCRIPTLET_MARKER = "#%#//";
const UBO_SCRIPTLET_MARKER = "##+js";
let ruleStartIndex;
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
} else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
}
const rulePart = source.ruleText.slice(ruleStartIndex);
Expand Down
4 changes: 2 additions & 2 deletions dist/redirect-files/naver-wcslog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
const AG_SCRIPTLET_MARKER = "#%#//";
const UBO_SCRIPTLET_MARKER = "##+js";
let ruleStartIndex;
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
} else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
}
const rulePart = source.ruleText.slice(ruleStartIndex);
Expand Down
17 changes: 4 additions & 13 deletions dist/redirect-files/noeval.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
const AG_SCRIPTLET_MARKER = "#%#//";
const UBO_SCRIPTLET_MARKER = "##+js";
let ruleStartIndex;
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
} else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
}
const rulePart = source.ruleText.slice(ruleStartIndex);
Expand All @@ -38,7 +38,7 @@
function logMessage(source, message) {
let forced = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
let convertMessageToString = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
const name = source.name, ruleText = source.ruleText, verbose = source.verbose;
const name = source.name, verbose = source.verbose;
if (!forced && !verbose) {
return;
}
Expand All @@ -47,16 +47,7 @@
nativeConsole("".concat(name, ":"), message);
return;
}
let messageStr = "".concat(name, ": ").concat(message);
if (ruleText) {
const RULE_MARKER = "#%#//scriptlet";
const markerIdx = ruleText.indexOf(RULE_MARKER);
if (markerIdx > -1) {
const ruleWithoutDomains = ruleText.slice(markerIdx, ruleText.length);
messageStr += "; cannot apply rule: ".concat(ruleWithoutDomains);
}
}
nativeConsole(messageStr);
nativeConsole("".concat(name, ": ").concat(message));
}
const updatedArgs = args ? [].concat(source).concat(args) : [ source ];
try {
Expand Down
4 changes: 2 additions & 2 deletions dist/redirect-files/pardot-1.0.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
const AG_SCRIPTLET_MARKER = "#%#//";
const UBO_SCRIPTLET_MARKER = "##+js";
let ruleStartIndex;
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
} else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
}
const rulePart = source.ruleText.slice(ruleStartIndex);
Expand Down
4 changes: 2 additions & 2 deletions dist/redirect-files/prebid-ads.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
const AG_SCRIPTLET_MARKER = "#%#//";
const UBO_SCRIPTLET_MARKER = "##+js";
let ruleStartIndex;
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
} else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
}
const rulePart = source.ruleText.slice(ruleStartIndex);
Expand Down
Loading

0 comments on commit a55b61f

Please sign in to comment.