Skip to content

Commit 05f83b1

Browse files
author
Atlassian Bamboo
committed
deploy: update dist v1.8.2
1 parent 04ee8ba commit 05f83b1

32 files changed

+12050
-8632
lines changed

‎dist/build.txt‎

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

‎dist/redirect-files/amazon-apstag.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(function(source, args) {
22
function AmazonApstag(source) {
3-
var apstagWrapper = {
4-
fetchBids: function fetchBids(a, b) {
3+
const apstagWrapper = {
4+
fetchBids(a, b) {
55
if (typeof b === "function") {
66
b([]);
77
}
@@ -18,19 +18,19 @@
1818
return;
1919
}
2020
try {
21-
var log = console.log.bind(console);
22-
var trace = console.trace.bind(console);
23-
var prefix = source.ruleText || "";
21+
const log = console.log.bind(console);
22+
const trace = console.trace.bind(console);
23+
let prefix = source.ruleText || "";
2424
if (source.domainName) {
25-
var AG_SCRIPTLET_MARKER = "#%#//";
26-
var UBO_SCRIPTLET_MARKER = "##+js";
27-
var ruleStartIndex;
25+
const AG_SCRIPTLET_MARKER = "#%#//";
26+
const UBO_SCRIPTLET_MARKER = "##+js";
27+
let ruleStartIndex;
2828
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
2929
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
3030
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
3131
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
3232
}
33-
var rulePart = source.ruleText.slice(ruleStartIndex);
33+
const rulePart = source.ruleText.slice(ruleStartIndex);
3434
prefix = "".concat(source.domainName).concat(rulePart);
3535
}
3636
log("".concat(prefix, " trace start"));

‎dist/redirect-files/ati-smarttag.js‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
(function(source, args) {
22
function ATInternetSmartTag(source) {
3-
var setNoopFuncWrapper = {
3+
const setNoopFuncWrapper = {
44
set: noopFunc
55
};
6-
var sendNoopFuncWrapper = {
6+
const sendNoopFuncWrapper = {
77
send: noopFunc
88
};
9-
var ecommerceWrapper = {
9+
const ecommerceWrapper = {
1010
displayCart: {
1111
products: setNoopFuncWrapper,
1212
cart: setNoopFuncWrapper
@@ -27,7 +27,7 @@
2727
products: setNoopFuncWrapper
2828
}
2929
};
30-
var tag = function tag() {};
30+
const tag = function tag() {};
3131
tag.prototype = {
3232
setConfig: noopFunc,
3333
setParam: noopFunc,
@@ -65,11 +65,9 @@
6565
removeAll: noopFunc
6666
}
6767
};
68-
var smartTagWrapper = {
68+
const smartTagWrapper = {
6969
Tracker: {
70-
Tag: function Tag() {
71-
return new tag;
72-
}
70+
Tag: tag
7371
}
7472
};
7573
window.ATInternet = smartTagWrapper;
@@ -80,19 +78,19 @@
8078
return;
8179
}
8280
try {
83-
var log = console.log.bind(console);
84-
var trace = console.trace.bind(console);
85-
var prefix = source.ruleText || "";
81+
const log = console.log.bind(console);
82+
const trace = console.trace.bind(console);
83+
let prefix = source.ruleText || "";
8684
if (source.domainName) {
87-
var AG_SCRIPTLET_MARKER = "#%#//";
88-
var UBO_SCRIPTLET_MARKER = "##+js";
89-
var ruleStartIndex;
85+
const AG_SCRIPTLET_MARKER = "#%#//";
86+
const UBO_SCRIPTLET_MARKER = "##+js";
87+
let ruleStartIndex;
9088
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
9189
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
9290
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
9391
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
9492
}
95-
var rulePart = source.ruleText.slice(ruleStartIndex);
93+
const rulePart = source.ruleText.slice(ruleStartIndex);
9694
prefix = "".concat(source.domainName).concat(rulePart);
9795
}
9896
log("".concat(prefix, " trace start"));

‎dist/redirect-files/click2load.html‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -90,22 +90,22 @@
9090
'use strict';
9191

9292
function clickToLoad() {
93-
var QUESTION_MARK = '?';
94-
var AMPERSAND = '&';
95-
var SEARCH_PARAMS_DIVIDER = '=';
96-
var ORIGIN_URL_PARAM = '__origin';
97-
var EXT_UNBLOCK_PARAM = '__unblock';
98-
var CL_UNBLOCK_PARAM = '__adg_unblock_token';
99-
var CL_SPECIFIC_UNBLOCK_PARAM = '__adg_unblock';
100-
var BLOCKING_RULE_PARAM = '__adg_blocking_rule';
101-
var CLICK_EVENT = 'click';
102-
var CL_FORCE_EVENT = 'force';
103-
var neededParams = [ORIGIN_URL_PARAM, EXT_UNBLOCK_PARAM, CL_UNBLOCK_PARAM, BLOCKING_RULE_PARAM];
104-
var parseSearchParam = function parseSearchParam(rawQueryStr) {
105-
var res = {};
106-
var pattern = /([^&=]+)=([^&]*)/g;
107-
var matchedData;
108-
var queryStr = rawQueryStr.substring(1);
93+
const QUESTION_MARK = '?';
94+
const AMPERSAND = '&';
95+
const SEARCH_PARAMS_DIVIDER = '=';
96+
const ORIGIN_URL_PARAM = '__origin';
97+
const EXT_UNBLOCK_PARAM = '__unblock';
98+
const CL_UNBLOCK_PARAM = '__adg_unblock_token';
99+
const CL_SPECIFIC_UNBLOCK_PARAM = '__adg_unblock';
100+
const BLOCKING_RULE_PARAM = '__adg_blocking_rule';
101+
const CLICK_EVENT = 'click';
102+
const CL_FORCE_EVENT = 'force';
103+
const neededParams = [ORIGIN_URL_PARAM, EXT_UNBLOCK_PARAM, CL_UNBLOCK_PARAM, BLOCKING_RULE_PARAM];
104+
const parseSearchParam = function parseSearchParam(rawQueryStr) {
105+
const res = {};
106+
const pattern = /([^&=]+)=([^&]*)/g;
107+
let matchedData;
108+
let queryStr = rawQueryStr.substring(1);
109109
while (matchedData = pattern.exec(queryStr)) {
110110
if (neededParams.indexOf(matchedData[1]) > -1) {
111111
res[matchedData[1]] = matchedData[2];
@@ -114,23 +114,23 @@
114114
}
115115
return res;
116116
};
117-
var paramsData = parseSearchParam(window.location.search);
118-
var getParamByKey = function getParamByKey(key) {
117+
const paramsData = parseSearchParam(window.location.search);
118+
const getParamByKey = function getParamByKey(key) {
119119
return paramsData[key] || '';
120120
};
121-
var extUnblockToken = getParamByKey(EXT_UNBLOCK_PARAM);
122-
var clUnblockToken = getParamByKey(CL_UNBLOCK_PARAM);
123-
var blockingRule = getParamByKey(BLOCKING_RULE_PARAM);
124-
var originUrl = clUnblockToken
121+
const extUnblockToken = getParamByKey(EXT_UNBLOCK_PARAM);
122+
const clUnblockToken = getParamByKey(CL_UNBLOCK_PARAM);
123+
const blockingRule = getParamByKey(BLOCKING_RULE_PARAM);
124+
const originUrl = clUnblockToken
125125
? window.location.href : decodeURIComponent(getParamByKey(ORIGIN_URL_PARAM));
126-
var clickTitleElem = document.getElementById('clickToLoadTitle');
127-
var clickSubtitleElem = document.getElementById('clickToLoadSubtitle');
128-
var clickButtonElem = document.getElementById('clickToLoadLink');
129-
var originUrlToDisplay = clUnblockToken ? originUrl.replace(/[&?]__adg_unblock_token=.*/, '') : originUrl;
126+
const clickTitleElem = document.getElementById('clickToLoadTitle');
127+
const clickSubtitleElem = document.getElementById('clickToLoadSubtitle');
128+
const clickButtonElem = document.getElementById('clickToLoadLink');
129+
const originUrlToDisplay = clUnblockToken ? originUrl.replace(/[&?]__adg_unblock_token=.*/, '') : originUrl;
130130
clickSubtitleElem.textContent = originUrlToDisplay;
131131
clickButtonElem.href = originUrlToDisplay;
132132
clickButtonElem.title = originUrlToDisplay;
133-
var translationsData = {
133+
const translationsData = {
134134
en: {
135135
title: 'Content blocked by AdGuard',
136136
button: 'Click to load'
@@ -176,13 +176,13 @@
176176
button: 'Однаково завантажити'
177177
}
178178
};
179-
var getTranslations = function getTranslations() {
180-
var baseLocaleData = translationsData.en;
179+
const getTranslations = function getTranslations() {
180+
const baseLocaleData = translationsData.en;
181181
try {
182-
var currentLocale = navigator.language.toLowerCase();
183-
var localeData = translationsData[currentLocale];
182+
const currentLocale = navigator.language.toLowerCase();
183+
let localeData = translationsData[currentLocale];
184184
if (!localeData) {
185-
var lang = currentLocale.split('-')[0];
185+
const lang = currentLocale.split('-')[0];
186186
localeData = translationsData[lang];
187187
}
188188
if (!localeData) {
@@ -193,24 +193,24 @@
193193
return baseLocaleData;
194194
}
195195
};
196-
var translations = getTranslations();
196+
const translations = getTranslations();
197197
clickTitleElem.textContent = translations.title;
198198
clickButtonElem.textContent = translations.button;
199-
var getReplaceUrl = function getReplaceUrl(originUrl, unblockTokenName, unblockTokenValue) {
200-
var questionMarkIndex = originUrl.indexOf(QUESTION_MARK);
201-
var divider = questionMarkIndex > -1 ? AMPERSAND : QUESTION_MARK;
199+
const getReplaceUrl = function getReplaceUrl(originUrl, unblockTokenName, unblockTokenValue) {
200+
const questionMarkIndex = originUrl.indexOf(QUESTION_MARK);
201+
let divider = questionMarkIndex > -1 ? AMPERSAND : QUESTION_MARK;
202202
if (originUrl.substring(questionMarkIndex).length === 1) {
203203
divider = '';
204204
}
205205
return "".concat(originUrl).concat(divider).concat(unblockTokenName).concat(SEARCH_PARAMS_DIVIDER).concat(unblockTokenValue);
206206
};
207-
var extRun = function extRun() {
208-
var replaceUrl = getReplaceUrl(originUrl, EXT_UNBLOCK_PARAM, extUnblockToken);
207+
const extRun = function extRun() {
208+
const replaceUrl = getReplaceUrl(originUrl, EXT_UNBLOCK_PARAM, extUnblockToken);
209209
window.location.replace(replaceUrl);
210210
};
211-
var clRun = function clRun() {
212-
var CL_SPECIFIC_UNBLOCK_VALUE = 1;
213-
var replaceUrl = getReplaceUrl(originUrl, CL_SPECIFIC_UNBLOCK_PARAM, CL_SPECIFIC_UNBLOCK_VALUE);
211+
const clRun = function clRun() {
212+
const CL_SPECIFIC_UNBLOCK_VALUE = 1;
213+
const replaceUrl = getReplaceUrl(originUrl, CL_SPECIFIC_UNBLOCK_PARAM, CL_SPECIFIC_UNBLOCK_VALUE);
214214
window.location.replace(replaceUrl);
215215
};
216216
clickButtonElem.addEventListener(CLICK_EVENT, function (e) {
@@ -228,17 +228,17 @@
228228
clickButtonElem.addEventListener(CL_FORCE_EVENT, function () {
229229
clRun();
230230
});
231-
var hasFrameModifier = function hasFrameModifier(rule) {
232-
var substringAfter = function substringAfter(str, separator) {
233-
var index = str.indexOf(separator);
231+
const hasFrameModifier = function hasFrameModifier(rule) {
232+
const substringAfter = function substringAfter(str, separator) {
233+
const index = str.indexOf(separator);
234234
return index < 0 ? '' : str.substring(index + separator.length);
235235
};
236-
var FRAME_MARKER = 'frame';
237-
var SUBDOCUMENT_MARKER = 'subdocument';
238-
var ruleModifiers = substringAfter(rule, '$').split(',');
236+
const FRAME_MARKER = 'frame';
237+
const SUBDOCUMENT_MARKER = 'subdocument';
238+
const ruleModifiers = substringAfter(rule, '$').split(',');
239239
return ruleModifiers.indexOf(FRAME_MARKER) > -1 || ruleModifiers.indexOf(SUBDOCUMENT_MARKER) > -1;
240240
};
241-
var isInsideFrame = function isInsideFrame() {
241+
const isInsideFrame = function isInsideFrame() {
242242
return window.self !== window.top;
243243
};
244244
if (clUnblockToken && blockingRule && hasFrameModifier(blockingRule) && !isInsideFrame()) {

‎dist/redirect-files/didomi-loader.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
return new UserConsentStatusForVendorSubscribe;
1414
};
1515
UserConsentStatusForVendor.prototype.subscribe = noopFunc;
16-
var DidomiWrapper = {
16+
const DidomiWrapper = {
1717
isConsentRequired: falseFunc,
1818
getUserConsentStatusForPurpose: trueFunc,
1919
getUserConsentStatus: trueFunc,
@@ -31,7 +31,7 @@
3131
showDataProcessing: trueFunc
3232
},
3333
isUserConsentStatusPartial: falseFunc,
34-
on: function on() {
34+
on() {
3535
return {
3636
actions: {},
3737
emitter: {},
@@ -41,12 +41,12 @@
4141
},
4242
shouldConsentBeCollected: falseFunc,
4343
getUserConsentStatusForAll: noopFunc,
44-
getObservableOnUserConsentStatusForVendor: function getObservableOnUserConsentStatusForVendor() {
44+
getObservableOnUserConsentStatusForVendor() {
4545
return new UserConsentStatusForVendor;
4646
}
4747
};
4848
window.Didomi = DidomiWrapper;
49-
var didomiStateWrapper = {
49+
const didomiStateWrapper = {
5050
didomiExperimentId: "",
5151
didomiExperimentUserGroup: "",
5252
didomiGDPRApplies: 1,
@@ -62,7 +62,7 @@
6262
didomiVendorsRawConsentUnknown: ""
6363
};
6464
window.didomiState = didomiStateWrapper;
65-
var tcData = {
65+
const tcData = {
6666
eventStatus: "tcloaded",
6767
gdprApplies: false,
6868
listenerId: noopFunc,
@@ -73,21 +73,21 @@
7373
consents: []
7474
}
7575
};
76-
var __tcfapiWrapper = function __tcfapiWrapper(command, version, callback) {
76+
const __tcfapiWrapper = function __tcfapiWrapper(command, version, callback) {
7777
if (typeof callback !== "function" || command === "removeEventListener") {
7878
return;
7979
}
8080
callback(tcData, true);
8181
};
8282
window.__tcfapi = __tcfapiWrapper;
83-
var didomiEventListenersWrapper = {
83+
const didomiEventListenersWrapper = {
8484
stub: true,
8585
push: noopFunc
8686
};
8787
window.didomiEventListeners = didomiEventListenersWrapper;
88-
var didomiOnReadyWrapper = {
88+
const didomiOnReadyWrapper = {
8989
stub: true,
90-
push: function push(arg) {
90+
push(arg) {
9191
if (typeof arg !== "function") {
9292
return;
9393
}
@@ -117,19 +117,19 @@
117117
return;
118118
}
119119
try {
120-
var log = console.log.bind(console);
121-
var trace = console.trace.bind(console);
122-
var prefix = source.ruleText || "";
120+
const log = console.log.bind(console);
121+
const trace = console.trace.bind(console);
122+
let prefix = source.ruleText || "";
123123
if (source.domainName) {
124-
var AG_SCRIPTLET_MARKER = "#%#//";
125-
var UBO_SCRIPTLET_MARKER = "##+js";
126-
var ruleStartIndex;
124+
const AG_SCRIPTLET_MARKER = "#%#//";
125+
const UBO_SCRIPTLET_MARKER = "##+js";
126+
let ruleStartIndex;
127127
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
128128
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
129129
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
130130
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
131131
}
132-
var rulePart = source.ruleText.slice(ruleStartIndex);
132+
const rulePart = source.ruleText.slice(ruleStartIndex);
133133
prefix = "".concat(source.domainName).concat(rulePart);
134134
}
135135
log("".concat(prefix, " trace start"));

‎dist/redirect-files/fingerprintjs2.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
(function(source, args) {
22
function Fingerprintjs2(source) {
3-
var browserId = "";
4-
for (var i = 0; i < 8; i += 1) {
3+
let browserId = "";
4+
for (let i = 0; i < 8; i += 1) {
55
browserId += (Math.random() * 65536 + 4096).toString(16).slice(-4);
66
}
7-
var Fingerprint2 = function Fingerprint2() {};
7+
const Fingerprint2 = function Fingerprint2() {};
88
Fingerprint2.get = function(options, callback) {
99
if (!callback) {
1010
callback = options;
@@ -26,19 +26,19 @@
2626
return;
2727
}
2828
try {
29-
var log = console.log.bind(console);
30-
var trace = console.trace.bind(console);
31-
var prefix = source.ruleText || "";
29+
const log = console.log.bind(console);
30+
const trace = console.trace.bind(console);
31+
let prefix = source.ruleText || "";
3232
if (source.domainName) {
33-
var AG_SCRIPTLET_MARKER = "#%#//";
34-
var UBO_SCRIPTLET_MARKER = "##+js";
35-
var ruleStartIndex;
33+
const AG_SCRIPTLET_MARKER = "#%#//";
34+
const UBO_SCRIPTLET_MARKER = "##+js";
35+
let ruleStartIndex;
3636
if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
3737
ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
3838
} else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
3939
ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
4040
}
41-
var rulePart = source.ruleText.slice(ruleStartIndex);
41+
const rulePart = source.ruleText.slice(ruleStartIndex);
4242
prefix = "".concat(source.domainName).concat(rulePart);
4343
}
4444
log("".concat(prefix, " trace start"));

0 commit comments

Comments
 (0)