From ada9d8db96836b47302c3d16cbdaec2d857f9cf4 Mon Sep 17 00:00:00 2001 From: Boulaffas Ae Date: Wed, 1 Apr 2020 20:59:12 +0100 Subject: [PATCH 1/5] Add Userlike service --- tarteaucitron.services.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 493f9a1..eda3b3c 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -3004,3 +3004,20 @@ tarteaucitron.services.youtubeapi = { tarteaucitron.addScript('https://www.youtube.com/player_api'); } }; + +// 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('https://userlike-cdn-widgets.s3-eu-west-1.amazonaws.com/' + tarteaucitron.user.userlikekey); + } +}; From 46488ad61601a83cf1fe3bb869c99983dee411fa Mon Sep 17 00:00:00 2001 From: Boulaffas Ae Date: Wed, 1 Apr 2020 21:07:45 +0100 Subject: [PATCH 2/5] camelCase user key in Userlike service --- tarteaucitron.services.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index eda3b3c..cb8feeb 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -3015,9 +3015,9 @@ tarteaucitron.services.userlike = { "cookies": ['uslk_s', 'uslk_e'], "js": function () { "use strict"; - if (tarteaucitron.user.userlikekey === undefined) { + if (tarteaucitron.user.userlikeKey === undefined) { return; } - tarteaucitron.addScript('https://userlike-cdn-widgets.s3-eu-west-1.amazonaws.com/' + tarteaucitron.user.userlikekey); + tarteaucitron.addScript('https://userlike-cdn-widgets.s3-eu-west-1.amazonaws.com/' + tarteaucitron.user.userlikeKey); } }; From 179256f73fb99513c18c32adc33e6b8817b16a40 Mon Sep 17 00:00:00 2001 From: Boulaffas Ae Date: Wed, 1 Apr 2020 21:09:28 +0100 Subject: [PATCH 3/5] Make sur Userclick service work in http too --- tarteaucitron.services.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index cb8feeb..aa846b2 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -3018,6 +3018,6 @@ tarteaucitron.services.userlike = { if (tarteaucitron.user.userlikeKey === undefined) { return; } - tarteaucitron.addScript('https://userlike-cdn-widgets.s3-eu-west-1.amazonaws.com/' + tarteaucitron.user.userlikeKey); + tarteaucitron.addScript('//userlike-cdn-widgets.s3-eu-west-1.amazonaws.com/' + tarteaucitron.user.userlikeKey); } }; From 9aa25317002c2b51d3e89ab792965edbc52196a1 Mon Sep 17 00:00:00 2001 From: nstCactus Date: Thu, 2 Apr 2020 11:59:28 +0200 Subject: [PATCH 4/5] =?UTF-8?q?=E2=9C=A8=20Add=20Facil'ITI=20service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tarteaucitron.services.js | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 493f9a1..cd6f7bb 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -1699,7 +1699,7 @@ tarteaucitron.services.rumbletalk = { var width = tarteaucitron.getElemWidth(x), height = tarteaucitron.getElemHeight(x), id = x.getAttribute("data-id"); - + return '
'; }); }, @@ -1709,7 +1709,7 @@ tarteaucitron.services.rumbletalk = { tarteaucitron.fallback(['rumbletalk'], function (elem) { elem.style.width = tarteaucitron.getElemWidth(elem) + 'px'; elem.style.height = tarteaucitron.getElemHeight(elem) + 'px'; - + return tarteaucitron.engage(id); }); } @@ -3004,3 +3004,27 @@ tarteaucitron.services.youtubeapi = { 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); + } +}; + From ec91bcdbaa243e0bc6d0fa9f46f2c884ea80ee00 Mon Sep 17 00:00:00 2001 From: Amauri CHAMPEAUX Date: Sat, 18 Apr 2020 15:20:20 +0200 Subject: [PATCH 5/5] New domain name: tarteaucitron.io --- README.md | 4 ++-- tarteaucitron.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c5da437..75e7850 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Bonus: # Installation guide -[Visit opt-out.ferank.eu](https://opt-out.ferank.eu/) +[Visit tarteaucitron.io](https://tarteaucitron.io/) # How to use @@ -51,7 +51,7 @@ tarteaucitron.init({ //"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 */ }); ``` diff --git a/tarteaucitron.js b/tarteaucitron.js index 921b6e0..67fc616 100644 --- a/tarteaucitron.js +++ b/tarteaucitron.js @@ -343,7 +343,7 @@ var tarteaucitron = { html += ' '; html += '
'; if (tarteaucitron.parameters.removeCredit === false) { - html += ' 🍋 ' + tarteaucitron.lang.credit + ''; + html += ' 🍋 ' + tarteaucitron.lang.credit + ''; } html += ' '; html += ' '; @@ -582,7 +582,7 @@ var tarteaucitron = { 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 !== '') { link = service.readmoreLink; } @@ -1604,7 +1604,7 @@ var tarteaucitron = { if (tarteaucitron.uuid !== '' && tarteaucitron.uuid !== undefined && tarteaucitron.proTemp !== '') { var div = document.getElementById('tarteaucitronPremium'), timestamp = new Date().getTime(), - url = 'https://opt-out.ferank.eu/log/?'; + url = 'https://tarteaucitron.io/log/?'; if (div === null) { return;