Merge branch 'master' into doc/custom-service-types
This commit is contained in:
commit
761112c1c9
|
|
@ -21,7 +21,7 @@ Bonus:
|
||||||
|
|
||||||
|
|
||||||
# Installation guide
|
# Installation guide
|
||||||
[Visit opt-out.ferank.eu](https://opt-out.ferank.eu/)
|
[Visit tarteaucitron.io](https://tarteaucitron.io/)
|
||||||
|
|
||||||
|
|
||||||
# How to use
|
# How to use
|
||||||
|
|
@ -51,7 +51,7 @@ tarteaucitron.init({
|
||||||
|
|
||||||
//"cookieDomain": ".my-multisite-domaine.fr", /* Shared cookie for subdomain website */
|
//"cookieDomain": ".my-multisite-domaine.fr", /* Shared cookie for subdomain website */
|
||||||
|
|
||||||
"readmoreLink": "/cookiespolicy" /* Change the default readmore link pointing to opt-out.ferank.eu */
|
"readmoreLink": "/cookiespolicy" /* Change the default readmore link pointing to tarteaucitron.io */
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
```
|
```
|
||||||
|
|
|
||||||
|
|
@ -343,7 +343,7 @@ var tarteaucitron = {
|
||||||
html += ' </ul>';
|
html += ' </ul>';
|
||||||
html += ' <div class="tarteaucitronHidden" id="tarteaucitronScrollbarChild" style="height:20px;display:block"></div>';
|
html += ' <div class="tarteaucitronHidden" id="tarteaucitronScrollbarChild" style="height:20px;display:block"></div>';
|
||||||
if (tarteaucitron.parameters.removeCredit === false) {
|
if (tarteaucitron.parameters.removeCredit === false) {
|
||||||
html += ' <a class="tarteaucitronSelfLink" href="https://opt-out.ferank.eu/" rel="nofollow noreferrer noopener" target="_blank" title="tarteaucitron ' + tarteaucitron.lang.newWindow + '">🍋 ' + tarteaucitron.lang.credit + '</a>';
|
html += ' <a class="tarteaucitronSelfLink" href="https://tarteaucitron.io/" rel="nofollow noreferrer noopener" target="_blank" title="tarteaucitron ' + tarteaucitron.lang.newWindow + '">🍋 ' + tarteaucitron.lang.credit + '</a>';
|
||||||
}
|
}
|
||||||
html += ' </div>';
|
html += ' </div>';
|
||||||
html += ' </div>';
|
html += ' </div>';
|
||||||
|
|
@ -582,7 +582,7 @@ var tarteaucitron = {
|
||||||
|
|
||||||
if (tarteaucitron.parameters.moreInfoLink == true) {
|
if (tarteaucitron.parameters.moreInfoLink == true) {
|
||||||
|
|
||||||
var link = 'https://opt-out.ferank.eu/service/' + service.key + '/';
|
var link = 'https://tarteaucitron.io/service/' + service.key + '/';
|
||||||
if (service.readmoreLink !== undefined && service.readmoreLink !== '') {
|
if (service.readmoreLink !== undefined && service.readmoreLink !== '') {
|
||||||
link = service.readmoreLink;
|
link = service.readmoreLink;
|
||||||
}
|
}
|
||||||
|
|
@ -1604,7 +1604,7 @@ var tarteaucitron = {
|
||||||
if (tarteaucitron.uuid !== '' && tarteaucitron.uuid !== undefined && tarteaucitron.proTemp !== '') {
|
if (tarteaucitron.uuid !== '' && tarteaucitron.uuid !== undefined && tarteaucitron.proTemp !== '') {
|
||||||
var div = document.getElementById('tarteaucitronPremium'),
|
var div = document.getElementById('tarteaucitronPremium'),
|
||||||
timestamp = new Date().getTime(),
|
timestamp = new Date().getTime(),
|
||||||
url = 'https://opt-out.ferank.eu/log/?';
|
url = 'https://tarteaucitron.io/log/?';
|
||||||
|
|
||||||
if (div === null) {
|
if (div === null) {
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
|
|
@ -1699,7 +1699,7 @@ tarteaucitron.services.rumbletalk = {
|
||||||
var width = tarteaucitron.getElemWidth(x),
|
var width = tarteaucitron.getElemWidth(x),
|
||||||
height = tarteaucitron.getElemHeight(x),
|
height = tarteaucitron.getElemHeight(x),
|
||||||
id = x.getAttribute("data-id");
|
id = x.getAttribute("data-id");
|
||||||
|
|
||||||
return '<div style="height: ' + height + 'px; width: ' + width + 'px;"><div id="' + id + '"></div></div>';
|
return '<div style="height: ' + height + 'px; width: ' + width + 'px;"><div id="' + id + '"></div></div>';
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
@ -1709,7 +1709,7 @@ tarteaucitron.services.rumbletalk = {
|
||||||
tarteaucitron.fallback(['rumbletalk'], function (elem) {
|
tarteaucitron.fallback(['rumbletalk'], function (elem) {
|
||||||
elem.style.width = tarteaucitron.getElemWidth(elem) + 'px';
|
elem.style.width = tarteaucitron.getElemWidth(elem) + 'px';
|
||||||
elem.style.height = tarteaucitron.getElemHeight(elem) + 'px';
|
elem.style.height = tarteaucitron.getElemHeight(elem) + 'px';
|
||||||
|
|
||||||
return tarteaucitron.engage(id);
|
return tarteaucitron.engage(id);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -3004,3 +3004,44 @@ tarteaucitron.services.youtubeapi = {
|
||||||
tarteaucitron.addScript('https://www.youtube.com/player_api');
|
tarteaucitron.addScript('https://www.youtube.com/player_api');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Facil'ITI
|
||||||
|
tarteaucitron.services.faciliti = {
|
||||||
|
"key": "faciliti",
|
||||||
|
"type": "other",
|
||||||
|
"name": "Facil'ITI",
|
||||||
|
"uri": "https://ws.facil-iti.com/mentions-legales.html",
|
||||||
|
"needConsent": true,
|
||||||
|
"cookies": ['FACIL_ITI_LS'],
|
||||||
|
"js": function () {
|
||||||
|
"use strict";
|
||||||
|
if (tarteaucitron.user.facilitiID === undefined) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
(function(w, d, s, f) {
|
||||||
|
w[f] = w[f] || {conf: function () { (w[f].data = w[f].data || []).push(arguments);}};
|
||||||
|
var l = d.createElement(s), e = d.getElementsByTagName(s)[0];
|
||||||
|
l.async = 1; l.src = 'https://ws.facil-iti.com/tag/faciliti-tag.min.js'; e.parentNode.insertBefore(l, e);
|
||||||
|
}(window, document, 'script', 'FACIL_ITI'));
|
||||||
|
FACIL_ITI.conf('userId', tarteaucitron.user.facilitiID);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// userlike
|
||||||
|
tarteaucitron.services.userlike = {
|
||||||
|
"key": "userlike",
|
||||||
|
"type": "support",
|
||||||
|
"name": "Userlike",
|
||||||
|
"uri": "https://www.userlike.com/en/terms#privacy-policy",
|
||||||
|
"needConsent": true,
|
||||||
|
"cookies": ['uslk_s', 'uslk_e'],
|
||||||
|
"js": function () {
|
||||||
|
"use strict";
|
||||||
|
if (tarteaucitron.user.userlikeKey === undefined) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
tarteaucitron.addScript('//userlike-cdn-widgets.s3-eu-west-1.amazonaws.com/' + tarteaucitron.user.userlikeKey);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue