From a93bd48a3e21ec2240892d0c544460dfd5a2be55 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Motto Date: Thu, 29 Apr 2021 18:10:16 +0200 Subject: [PATCH 01/28] Add allowfullscreen param to youtube service. Default value is allowed. --- tarteaucitron.services.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 6174d79..a3e9f43 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -3282,6 +3282,7 @@ tarteaucitron.services.youtube = { video_height = x.getAttribute("height"), frame_height = 'height=', video_frame, + allowfullscreen = x.getAttribute("allowfullscreen"), attrs = ["theme", "rel", "controls", "showinfo", "autoplay", "mute", "start"], params = attrs.filter(function (a) { return x.getAttribute(a) !== null; @@ -3302,7 +3303,7 @@ tarteaucitron.services.youtube = { } else { frame_height += '"" '; } - video_frame = ''; + video_frame = ''; return video_frame; }); }, From e52df90a875c182b5925b681fb6329889054ed9a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Motto Date: Thu, 29 Apr 2021 18:28:34 +0200 Subject: [PATCH 02/28] Add allowfullscreen param to youtube playlist service. Default value is allowed. --- tarteaucitron.services.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index a3e9f43..2e7573a 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -3336,6 +3336,7 @@ tarteaucitron.services.youtubeplaylist = { video_height = x.getAttribute("height"), frame_height = 'height=', video_frame, + allowfullscreen = x.getAttribute("allowfullscreen"), params = 'theme=' + x.getAttribute("theme") + '&rel=' + x.getAttribute("rel") + '&controls=' + x.getAttribute("controls") + '&showinfo=' + x.getAttribute("showinfo") + '&autoplay=' + x.getAttribute("autoplay") + '&mute=' + x.getAttribute("mute"); if (playlist_id === undefined) { @@ -3351,7 +3352,7 @@ tarteaucitron.services.youtubeplaylist = { } else { frame_height += '"" '; } - video_frame = ''; + video_frame = ''; return video_frame; }); }, From 8dd80450b2e582ebe3994b534eba72382cde91d9 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Motto Date: Thu, 29 Apr 2021 18:40:23 +0200 Subject: [PATCH 03/28] Add allowfullscreen param to vimeo service. Default value is allowed. --- tarteaucitron.services.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 2e7573a..38d2ad0 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -2889,6 +2889,7 @@ tarteaucitron.services.vimeo = { frame_height = 'height=', video_id = x.getAttribute("data-videoID") || x.getAttribute("videoID"), + video_allowfullscreen = x.getAttribute("data-allowfullscreen"), video_autopause = x.getAttribute("data-autopause") || '', video_autoplay = x.getAttribute("data-autoplay") || x.getAttribute("autoplay") || '', video_background = x.getAttribute("data-background") || '', @@ -3030,7 +3031,7 @@ tarteaucitron.services.vimeo = { video_qs = ""; } - video_frame = ''; + video_frame = ''; return video_frame; }); From 3eb5a250d85e0f6e1cced7b808f0fe2e45101b57 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Motto Date: Thu, 29 Apr 2021 19:22:46 +0200 Subject: [PATCH 04/28] Add allowfullscreen param to matterport service. Default value is allowed. --- tarteaucitron.services.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 38d2ad0..52f55a7 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -3816,6 +3816,7 @@ tarteaucitron.services.matterport = { matterport_height = x.getAttribute("height"), frame_height = 'height=', matterport_parameters = x.getAttribute("parameters"), + matterport_allowfullscreen = x.getAttribute('allowfullscreen'), matterport_frame; if (matterport_id === undefined) { @@ -3835,7 +3836,7 @@ tarteaucitron.services.matterport = { return ""; } - matterport_frame = ''; + matterport_frame = ''; return matterport_frame; }); }, From 1c943e413de43bc09aae432f68ddf5eea7d9bba4 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Motto Date: Thu, 29 Apr 2021 19:37:33 +0200 Subject: [PATCH 05/28] Add allowfullscreen param to web iframe service. Default value is allowed. --- tarteaucitron.services.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 52f55a7..fb47e24 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -15,9 +15,10 @@ tarteaucitron.services.iframe = { var frame_title = tarteaucitron.fixSelfXSS(x.getAttribute("title")), width = x.getAttribute("width"), height = x.getAttribute("height"), + allowfullscreen = x.getAttribute("allowfullscreen"), url = x.getAttribute("data-url"); - return ''; + return ''; }); }, "fallback": function () { From f8f2795d24b8e7ff098a284544c0da624545980e Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Motto Date: Thu, 29 Apr 2021 19:48:20 +0200 Subject: [PATCH 06/28] Add allowfullscreen param to web helloasso service. Default value is allowed. --- tarteaucitron.services.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index fb47e24..d31026a 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -234,9 +234,10 @@ tarteaucitron.services.helloasso = { var frame_title = tarteaucitron.fixSelfXSS(x.getAttribute("title") || 'HelloAsso iframe'), width = x.getAttribute("width"), height = x.getAttribute("height"), - url = x.getAttribute("data-url"); + url = x.getAttribute("data-url"), + allowfullscreen = x.getAttribute("allowfullscreen"); - return ''; + return ''; }); }, "fallback": function () { From 3b61ed17c883ed2d668baaa61e87cbf04c973d36 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Motto Date: Thu, 29 Apr 2021 19:57:40 +0200 Subject: [PATCH 07/28] Add allowfullscreen param to web podcloud service. Default value is allowed. --- tarteaucitron.services.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index d31026a..d5ec9cc 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -265,9 +265,10 @@ tarteaucitron.services.podcloud = { var frame_title = tarteaucitron.fixSelfXSS(x.getAttribute("title") || 'podCloud iframe'), width = x.getAttribute("width"), height = x.getAttribute("height"), - url = x.getAttribute("data-url"); + url = x.getAttribute("data-url"), + allowfullscreen= x.getAttribute("allowfullscreen"); - return ''; + return ''; }); }, "fallback": function () { From c5ea5da4665e69e65692c144471facab9c831186 Mon Sep 17 00:00:00 2001 From: Amauri CHAMPEAUX Date: Fri, 30 Apr 2021 09:54:58 +0200 Subject: [PATCH 08/28] Prevent atinternet to be loaded twice --- tarteaucitron.services.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 6174d79..9ecf0ad 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -3191,6 +3191,10 @@ tarteaucitron.services.atinternet = { return; } + if (tarteaucitron.user.atinternetAlreadyLoaded !== undefined) { + return; + } + tarteaucitron.addScript(tarteaucitron.user.atLibUrl, '', function() { window.tag = new ATInternet.Tracker.Tag(); @@ -3214,6 +3218,8 @@ tarteaucitron.services.atinternet = { return; } + tarteaucitron.user.atinternetAlreadyLoaded = true; + tarteaucitron.addScript(tarteaucitron.user.atLibUrl, '', function() { window.tag = new ATInternet.Tracker.Tag(); From f7a12bcb9a7dcc313853e32643a566af242d03e3 Mon Sep 17 00:00:00 2001 From: Amauri CHAMPEAUX Date: Fri, 30 Apr 2021 09:56:21 +0200 Subject: [PATCH 09/28] Prevent getquanty to be loaded twice --- tarteaucitron.services.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 9ecf0ad..fb2b50d 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -3934,6 +3934,10 @@ tarteaucitron.services.getquanty = { return; } + if (tarteaucitron.user.getquantyAlreadyLoaded !== undefined) { + return; + } + tarteaucitron.addScript('https://get.smart-data-systems.com/gq?site_id=' + tarteaucitron.user.getguanty + '&consent=1'); }, "fallback": function () { @@ -3942,6 +3946,8 @@ tarteaucitron.services.getquanty = { return; } + tarteaucitron.user.getquantyAlreadyLoaded = true; + tarteaucitron.addScript('https://get.smart-data-systems.com/gq?site_id=' + tarteaucitron.user.getguanty + '¬rack=1'); } }; From 1202052eaeba3acc4607549e2d81713cf7833bdd Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Motto Date: Fri, 30 Apr 2021 10:12:22 +0200 Subject: [PATCH 10/28] Add allowfullscreen param to web facebookpost service. Default value is allowed. --- tarteaucitron.services.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index d5ec9cc..89d0114 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -293,13 +293,14 @@ tarteaucitron.services.facebookpost = { "js": function () { "use strict"; tarteaucitron.fallback(['tac_facebookpost'], function (x) { - var frame_title = tarteaucitron.fixSelfXSS(x.getAttribute("title") || 'Facebook iframe'), + var frame_title = tarteaucitron.fixSelfXSS(x.getAttribute("title") || 'Michel'), width = x.getAttribute("width"), height = x.getAttribute("height"), url = x.getAttribute("data-url"), - appId = x.getAttribute("data-appid"); + appId = x.getAttribute("data-appid"), + allowfullscreen = x.getAttribute("allowfullscreen"); - return ''; + return ''; }); }, "fallback": function () { From 2452c5b924f287febc8ebaaa117336832e4faa08 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Motto Date: Fri, 30 Apr 2021 10:22:03 +0200 Subject: [PATCH 11/28] Add allowfullscreen param to web calameo service. Default value is allowed. --- tarteaucitron.services.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 89d0114..c42137f 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -733,9 +733,10 @@ tarteaucitron.services.calameo = { id = x.getAttribute("data-id"), width = x.getAttribute("width"), height = x.getAttribute("height"), - url = '//v.calameo.com/?bkcode=' + id; + url = '//v.calameo.com/?bkcode=' + id, + allowfullscreen = x.getAttribute("allowfullscreen"); - return ''; + return ''; }); }, "fallback": function () { From 93ac6b3289b9e85dd681190800c719fc4d725ea9 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Motto Date: Fri, 30 Apr 2021 12:16:55 +0200 Subject: [PATCH 12/28] Add allowfullscreen param to web arte.tv service. Default value is allowed. --- tarteaucitron.services.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index c42137f..94c19b8 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -939,13 +939,14 @@ tarteaucitron.services.artetv = { video_json = x.getAttribute("json"), video_width = x.getAttribute("width"), video_height = x.getAttribute("height"), - video_frame; + video_frame, + video_allowfullscreen = x.getAttribute("allowfullscreen"); if (video_json === undefined) { return ""; } - video_frame = ''; + video_frame = ''; return video_frame; }); }, From cd43d9fd91715c0687b15c244568d3ac8aa90c47 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Motto Date: Fri, 30 Apr 2021 12:21:35 +0200 Subject: [PATCH 13/28] Add allowfullscreen param to web dailymotion service. Default value is allowed. --- tarteaucitron.services.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 94c19b8..9677c37 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -980,6 +980,7 @@ tarteaucitron.services.dailymotion = { frame_height = 'height=', video_frame, embed_type = x.getAttribute("embedType"), + allowfullscreen = x.getAttribute("allowfullscreen"), params = 'info=' + x.getAttribute("showinfo") + '&autoPlay=' + x.getAttribute("autoplay"); if (video_id === undefined) { @@ -998,7 +999,7 @@ tarteaucitron.services.dailymotion = { if (embed_type === undefined || !['video', 'playlist'].includes(embed_type) ) { embed_type = "video"; } - video_frame = ''; + video_frame = ''; return video_frame; }); }, From fbcb6574966c9e6256e15407dbb9a93bbe1e757a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Motto Date: Fri, 30 Apr 2021 14:13:33 +0200 Subject: [PATCH 14/28] Add allowfullscreen param to deezer service. Default value is allowed. --- tarteaucitron.services.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 9677c37..73d0118 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -1127,6 +1127,7 @@ tarteaucitron.services.deezer = { embed_type = x.getAttribute("embedType"), radius = x.getAttribute("radius"), tracklist = x.getAttribute("tracklist"), + allowfullscreen = x.getAttribute("allowfullscreen"), params; if (deezer_id === undefined) { @@ -1155,7 +1156,7 @@ tarteaucitron.services.deezer = { tracklist = "true"; } params = 'tracklist=' + tracklist + '&radius=' + radius; - deezer_frame = ''; + deezer_frame = ''; return deezer_frame; }); }, From a43e2725f8510a8d5e7c241860e424bf9e37d7f4 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Motto Date: Fri, 30 Apr 2021 16:38:45 +0200 Subject: [PATCH 15/28] Add webkit and moz allowfullscreen compatibility for youtube and youtube playlist services. --- tarteaucitron.services.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 73d0118..6948875 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -3312,7 +3312,7 @@ tarteaucitron.services.youtube = { } else { frame_height += '"" '; } - video_frame = ''; + video_frame = ''; return video_frame; }); }, @@ -3361,7 +3361,7 @@ tarteaucitron.services.youtubeplaylist = { } else { frame_height += '"" '; } - video_frame = ''; + video_frame = ''; return video_frame; }); }, From 6385d8dc1917da4fbecd4fbfd943b9c9f46061bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Bell=C3=AAtre?= Date: Wed, 5 May 2021 15:55:25 +0200 Subject: [PATCH 16/28] Update Soundcloud, Facebook and Ausha services Add cookies list for Soundcloud and Facebook Set needConsent to false as it doesn't use cookies --- tarteaucitron.services.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index fb2b50d..8c55662 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -1261,7 +1261,7 @@ tarteaucitron.services.facebook = { "name": "Facebook", "uri": "https://www.facebook.com/policy.php", "needConsent": true, - "cookies": [], + "cookies": ['xs', 'sb', 'fr', 'datr', 'dpr', 'c_user'], "js": function () { "use strict"; tarteaucitron.fallback(['fb-post', 'fb-follow', 'fb-activity', 'fb-send', 'fb-share-button', 'fb-like', 'fb-video'], ''); @@ -2505,7 +2505,7 @@ tarteaucitron.services.soundcloud = { type: 'video', name: 'SoundCloud', needConsent: true, - cookies: ['sc_anonymous_id'], + cookies: ['sc_anonymous_id', 'sclocale'], js: function () { "use strict"; tarteaucitron.fallback(['soundcloud_player'], function (x) { @@ -4073,7 +4073,7 @@ tarteaucitron.services.ausha = { type: "video", name: "Ausha", uri: "https://www.ausha.co/protection-personal-data/", - needConsent: true, + needConsent: false, cookies: [], js: function () { "use strict"; From c5fc6e4105a5f1e8b4f8922c7820efff70586082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Bell=C3=AAtre?= Date: Wed, 5 May 2021 16:19:18 +0200 Subject: [PATCH 17/28] Revert needConsent for Ausha service --- tarteaucitron.services.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 8c55662..08a18e5 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -4073,7 +4073,7 @@ tarteaucitron.services.ausha = { type: "video", name: "Ausha", uri: "https://www.ausha.co/protection-personal-data/", - needConsent: false, + needConsent: true, cookies: [], js: function () { "use strict"; From a01d3f50f7d9cd3e62fe96cb8c0c76113aa22673 Mon Sep 17 00:00:00 2001 From: Amauri CHAMPEAUX Date: Thu, 6 May 2021 15:40:45 +0200 Subject: [PATCH 18/28] Remove Logical_nullish_assignment --- tarteaucitron.services.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 08a18e5..9875ba3 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -155,7 +155,7 @@ tarteaucitron.services.xandrsegment = { tarteaucitron.fallback(['xandrsegment-canvas'], function (x) { var uniqId = '_' + Math.random().toString(36).substr(2, 9); uniqIds.push(uniqId); - return '
'; + return '
'; }); for (i = 0; i < uniqIds.length; i += 1) { @@ -197,7 +197,7 @@ tarteaucitron.services.xandrconversion = { tarteaucitron.fallback(['xandrconversion-canvas'], function (x) { var uniqId = '_' + Math.random().toString(36).substr(2, 9); uniqIds.push(uniqId); - return '
'; + return '
'; }); for (i = 0; i < uniqIds.length; i += 1) { From be52a5c654619f296ee68045bac6aca38a50dfda Mon Sep 17 00:00:00 2001 From: Amauri CHAMPEAUX Date: Sat, 8 May 2021 10:24:21 +0200 Subject: [PATCH 19/28] Add elfsight --- tarteaucitron.services.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 9875ba3..e40a99a 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -31,6 +31,22 @@ tarteaucitron.services.iframe = { } }; + +// elfsight +tarteaucitron.services.elfsight = { + "key": "elfsight", + "type": "support", + "name": "Elfsight", + "uri": "https://elfsight.com/privacy-policy/", + "needConsent": true, + "cookies": ['__cfduid', '_p_hfp_client_id', 'session_id'], + "js": function () { + "use strict"; + + tarteaucitron.addScript('https://apps.elfsight.com/p/platform.js'); + } +}; + // sharpspring tarteaucitron.services.sharpspring = { "key": "sharpspring", From d33736f398c13147ce12ea65d80035a79ebd9696 Mon Sep 17 00:00:00 2001 From: Amauri CHAMPEAUX Date: Sat, 8 May 2021 10:26:19 +0200 Subject: [PATCH 20/28] add plezi --- tarteaucitron.services.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index e40a99a..aac7ec8 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -47,6 +47,25 @@ tarteaucitron.services.elfsight = { } }; +// plezi +tarteaucitron.services.plezi = { + "key": "plezi", + "type": "analytic", + "name": "Plezi", + "uri": "https://www.plezi.co/fr/mentions-legales/", + "needConsent": true, + "cookies": [], + "js": function () { + "use strict"; + + if (tarteaucitron.user.pleziTenant === undefined || tarteaucitron.user.pleziTw === undefined) { + return; + } + + tarteaucitron.addScript('https://app.plezi.co/scripts/ossleads_analytics.js?tenant=' + tarteaucitron.user.pleziTenant + '&tw=' + tarteaucitron.user.pleziTw); + } +}; + // sharpspring tarteaucitron.services.sharpspring = { "key": "sharpspring", From ef29a87e4e3c1b951df8455527599a588f0a79ef Mon Sep 17 00:00:00 2001 From: Amauri CHAMPEAUX Date: Sat, 8 May 2021 10:32:51 +0200 Subject: [PATCH 21/28] Add smartsupp --- tarteaucitron.services.js | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index aac7ec8..78032d7 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -66,6 +66,35 @@ tarteaucitron.services.plezi = { } }; + +// smartsupp +tarteaucitron.services.smartsupp = { + "key": "smartsupp", + "type": "support", + "name": "Smartsupp", + "uri": "https://www.smartsupp.com/help/privacy/", + "needConsent": true, + "cookies": ['ssupp.vid', 'ssupp.visits', 'AWSALB', 'AWSALBCORS'], + "js": function () { + "use strict"; + + if (tarteaucitron.user.smartsuppKey === undefined) { + return; + } + + window._smartsupp = _smartsupp || {}; + window._smartsupp.key = tarteaucitron.user.smartsuppKey; + window.smartsupp = function() { + window.smartsupp._.push(arguments) + }; + window.smartsupp._ = []; + + tarteaucitron.addScript('https://www.smartsuppchat.com/loader.js'); + } +}; + + + // sharpspring tarteaucitron.services.sharpspring = { "key": "sharpspring", From a051fb1b9ceba88ab1f6341744723005b29542da Mon Sep 17 00:00:00 2001 From: Amauri CHAMPEAUX Date: Sat, 8 May 2021 10:38:21 +0200 Subject: [PATCH 22/28] Fix smartsupp --- tarteaucitron.services.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 78032d7..c663a55 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -82,7 +82,7 @@ tarteaucitron.services.smartsupp = { return; } - window._smartsupp = _smartsupp || {}; + window._smartsupp = window._smartsupp || {}; window._smartsupp.key = tarteaucitron.user.smartsuppKey; window.smartsupp = function() { window.smartsupp._.push(arguments) From 74bff595d29f5705f2e517a04ffd520ac6e33472 Mon Sep 17 00:00:00 2001 From: Amauri CHAMPEAUX Date: Sun, 9 May 2021 12:11:32 +0200 Subject: [PATCH 23/28] =?UTF-8?q?Some=20fix=20for=20=F0=9F=A6=95=20browser?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tarteaucitron.js | 44 +++++++++++++++++++++------------------ tarteaucitron.services.js | 13 +++--------- 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/tarteaucitron.js b/tarteaucitron.js index 698397a..0eb4bc4 100644 --- a/tarteaucitron.js +++ b/tarteaucitron.js @@ -17,7 +17,7 @@ var scripts = document.getElementsByTagName('script'), var tarteaucitron = { - "version": 20210422, + "version": 20210509, "cdn": cdn, "user": {}, "lang": {}, @@ -517,13 +517,13 @@ var tarteaucitron = { var tacRootAvailableEvent; if(typeof(Event) === 'function') { tacRootAvailableEvent = new Event("tac.root_available"); - }else{ + }else if (typeof(document.createEvent) === 'function'){ tacRootAvailableEvent = document.createEvent('Event'); tacRootAvailableEvent.initEvent("tac.root_available", true, true); } //end ie compatibility - window.dispatchEvent(tacRootAvailableEvent); + if (typeof(window.dispatchEvent) === 'function') {window.dispatchEvent(tacRootAvailableEvent);} if (tarteaucitron.job !== undefined) { tarteaucitron.job = tarteaucitron.cleanArray(tarteaucitron.job); @@ -862,7 +862,7 @@ var tarteaucitron = { var send_event_item; if(typeof(Event) === 'function') { send_event_item = new Event(event_key); - }else{ + }else if (typeof(document.createEvent) === 'function'){ send_event_item = document.createEvent('Event'); send_event_item.initEvent(event_key, true, true); } @@ -923,13 +923,13 @@ var tarteaucitron = { }, "addClass": function (id, className) { "use strict"; - if (document.getElementById(id) !== null) { + if (document.getElementById(id) !== null && document.getElementById(id).classList !== undefined) { document.getElementById(id).classList.add(className); } }, "removeClass": function (id, className) { "use strict"; - if (document.getElementById(id) !== null) { + if (document.getElementById(id) !== null && document.getElementById(id).classList !== undefined) { document.getElementById(id).classList.remove(className); } }, @@ -1028,11 +1028,11 @@ var tarteaucitron = { if (key !== "") { if (status === true) { - document.getElementById(key + 'Line').classList.add('tarteaucitronIsAllowed'); - document.getElementById(key + 'Line').classList.remove('tarteaucitronIsDenied'); + tarteaucitron.userInterface.addClass(key + 'Line', 'tarteaucitronIsAllowed'); + tarteaucitron.userInterface.removeClass(key + 'Line', 'tarteaucitronIsDenied'); } else if (status === false) { - document.getElementById(key + 'Line').classList.remove('tarteaucitronIsAllowed'); - document.getElementById(key + 'Line').classList.add('tarteaucitronIsDenied'); + tarteaucitron.userInterface.removeClass(key + 'Line', 'tarteaucitronIsAllowed'); + tarteaucitron.userInterface.addClass(key + 'Line', 'tarteaucitronIsDenied'); } // check if all services are allowed @@ -1141,7 +1141,9 @@ var tarteaucitron = { tarteaucitron.userInterface.css('tarteaucitronCookiesListContainer', 'display', 'none'); document.getElementById('tarteaucitronClosePanel').focus(); - document.getElementsByTagName('body')[0].classList.add('tarteaucitron-modal-open'); + if (document.getElementsByTagName('body')[0].classList !== undefined) { + document.getElementsByTagName('body')[0].classList.add('tarteaucitron-modal-open'); + } tarteaucitron.userInterface.focusTrap(); tarteaucitron.userInterface.jsSizing('main'); @@ -1149,13 +1151,13 @@ var tarteaucitron = { var tacOpenPanelEvent; if(typeof(Event) === 'function') { tacOpenPanelEvent = new Event("tac.open_panel"); - }else{ + }else if (typeof(document.createEvent) === 'function'){ tacOpenPanelEvent = document.createEvent('Event'); tacOpenPanelEvent.initEvent("tac.open_panel", true, true); } //end ie compatibility - window.dispatchEvent(tacOpenPanelEvent); + if (typeof(window.dispatchEvent) === 'function') {window.dispatchEvent(tacOpenPanelEvent);} }, "closePanel": function () { "use strict"; @@ -1182,19 +1184,21 @@ var tarteaucitron = { if (document.getElementById('tarteaucitronCloseAlert') !== null) { document.getElementById('tarteaucitronCloseAlert').focus(); } - document.getElementsByTagName('body')[0].classList.remove('tarteaucitron-modal-open'); + if (document.getElementsByTagName('body')[0].classList !== undefined) { + document.getElementsByTagName('body')[0].classList.remove('tarteaucitron-modal-open'); + } //ie compatibility var tacClosePanelEvent; if(typeof(Event) === 'function') { tacClosePanelEvent = new Event("tac.close_panel"); - }else{ + }else if (typeof(document.createEvent) === 'function'){ tacClosePanelEvent = document.createEvent('Event'); tacClosePanelEvent.initEvent("tac.close_panel", true, true); } //end ie compatibility - window.dispatchEvent(tacClosePanelEvent); + if (typeof(window.dispatchEvent) === 'function') {window.dispatchEvent(tacClosePanelEvent);} }, "focusTrap": function() { "use strict"; @@ -1249,7 +1253,7 @@ var tarteaucitron = { var tacOpenAlertEvent; if(typeof(Event) === 'function') { tacOpenAlertEvent = new Event("tac.open_alert"); - }else{ + }else if (typeof(document.createEvent) === 'function'){ tacOpenAlertEvent = document.createEvent('Event'); tacOpenAlertEvent.initEvent("tac.open_alert", true, true); } @@ -1259,7 +1263,7 @@ var tarteaucitron = { document.getElementById('tarteaucitronAlertBig').focus(); } - window.dispatchEvent(tacOpenAlertEvent); + if (typeof(window.dispatchEvent) === 'function') {window.dispatchEvent(tacOpenAlertEvent);} }, "closeAlert": function () { "use strict"; @@ -1275,13 +1279,13 @@ var tarteaucitron = { var tacCloseAlertEvent; if(typeof(Event) === 'function') { tacCloseAlertEvent = new Event("tac.close_alert"); - }else{ + }else if (typeof(document.createEvent) === 'function'){ tacCloseAlertEvent = document.createEvent('Event'); tacCloseAlertEvent.initEvent("tac.close_alert", true, true); } //end ie compatibility - window.dispatchEvent(tacCloseAlertEvent); + if (typeof(window.dispatchEvent) === 'function') {window.dispatchEvent(tacCloseAlertEvent);} }, "toggleCookiesList": function () { "use strict"; diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 76e9337..fb2fe59 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -357,7 +357,7 @@ tarteaucitron.services.facebookpost = { "js": function () { "use strict"; tarteaucitron.fallback(['tac_facebookpost'], function (x) { - var frame_title = tarteaucitron.fixSelfXSS(x.getAttribute("title") || 'Michel'), + var frame_title = tarteaucitron.fixSelfXSS(x.getAttribute("title") || 'Facebook iframe'), width = x.getAttribute("width"), height = x.getAttribute("height"), url = x.getAttribute("data-url"), @@ -1826,14 +1826,7 @@ tarteaucitron.services.gtag = { * https://support.google.com/analytics/answer/7476333?hl=en * https://developers.google.com/analytics/devguides/collection/gtagjs/cross-domain */ - gtag( - 'config', - tarteaucitron.user.gtagUa, - { 'anonymize_ip': true }, - {linker: { - domains: tarteaucitron.user.gtagCrossdomain, - }}, - ); + gtag('config',tarteaucitron.user.gtagUa,{ 'anonymize_ip': true },{linker: {domains: tarteaucitron.user.gtagCrossdomain,}}); } else { gtag('config', tarteaucitron.user.gtagUa, { 'anonymize_ip': true }); } @@ -3158,7 +3151,7 @@ tarteaucitron.services.verizondottag = { }); tarteaucitron.addScript('https://s.yimg.com/wi/ytc.js', '', function () { - const items = window.dotq; + //const items = window.dotq; window.dotq = []; window.dotq.push = function (item) { YAHOO.ywa.I13N.fireBeacon([item]) From aaed3a852794b7f648fb15c9fca787fa215000e1 Mon Sep 17 00:00:00 2001 From: Amauri CHAMPEAUX Date: Sun, 9 May 2021 14:40:41 +0200 Subject: [PATCH 24/28] Move the allowed/denied indicator near the cookie information --- css/tarteaucitron.css | 8 ++++++++ tarteaucitron.js | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/css/tarteaucitron.css b/css/tarteaucitron.css index 940f8e5..a01964c 100644 --- a/css/tarteaucitron.css +++ b/css/tarteaucitron.css @@ -13,6 +13,14 @@ span.tarteaucitronReadmoreSeparator { } /******/ +/** 09052021 **/ +.tarteaucitronName .tacCurrentStatus, .tarteaucitronName .tarteaucitronReadmoreSeparator { + color: #333!important; + font-size: 12px!important; + text-transform: capitalize; +} +/**************/ + /** 27032021 **/ button.tarteaucitron-toggle-group { display: block; diff --git a/tarteaucitron.js b/tarteaucitron.js index 0eb4bc4..31367cb 100644 --- a/tarteaucitron.js +++ b/tarteaucitron.js @@ -761,9 +761,10 @@ var tarteaucitron = { html += '
  • '; html += '
    '; - html += ' ' + service.name + ' ('+currentStatus+')'; + html += ' ' + service.name + ''; + html += ' '+currentStatus+''; + html += ' - '; html += '
    '; - if (tarteaucitron.parameters.moreInfoLink == true) { var link = 'https://tarteaucitron.io/service/' + service.key + '/'; From 9706e06f82ce4e2778707cb20ad4c92aebe98563 Mon Sep 17 00:00:00 2001 From: Amauri CHAMPEAUX Date: Tue, 11 May 2021 09:59:51 +0200 Subject: [PATCH 25/28] Add "srcdoc", "loading", "loop" to youtube --- tarteaucitron.services.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index fb2fe59..53fcd48 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -3355,7 +3355,7 @@ tarteaucitron.services.youtube = { frame_height = 'height=', video_frame, allowfullscreen = x.getAttribute("allowfullscreen"), - attrs = ["theme", "rel", "controls", "showinfo", "autoplay", "mute", "start"], + attrs = ["theme", "rel", "controls", "showinfo", "autoplay", "mute", "start", "srcdoc", "loading", "loop"], params = attrs.filter(function (a) { return x.getAttribute(a) !== null; }).map(function (a) { From 4d413c469e2f6accb55c88f90b95e3e51e2bc84e Mon Sep 17 00:00:00 2001 From: Amauri CHAMPEAUX Date: Fri, 14 May 2021 09:33:27 +0200 Subject: [PATCH 26/28] Fix srcdoc & loading attributes for youtube --- tarteaucitron.services.js | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 53fcd48..3519dde 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -3349,13 +3349,15 @@ tarteaucitron.services.youtube = { tarteaucitron.fallback(['youtube_player'], function (x) { var frame_title = tarteaucitron.fixSelfXSS(x.getAttribute("title") || 'Youtube iframe'), video_id = x.getAttribute("videoID"), + srcdoc = x.getAttribute("srcdoc"), + loading = x.getAttribute("loading"), video_width = x.getAttribute("width"), frame_width = 'width=', video_height = x.getAttribute("height"), frame_height = 'height=', video_frame, allowfullscreen = x.getAttribute("allowfullscreen"), - attrs = ["theme", "rel", "controls", "showinfo", "autoplay", "mute", "start", "srcdoc", "loading", "loop"], + attrs = ["theme", "rel", "controls", "showinfo", "autoplay", "mute", "start", "loop"], params = attrs.filter(function (a) { return x.getAttribute(a) !== null; }).map(function (a) { @@ -3375,7 +3377,20 @@ tarteaucitron.services.youtube = { } else { frame_height += '"" '; } - video_frame = ''; + + if (srcdoc !== undefined && srcdoc !== null && srcdoc !== "") { + srcdoc = 'srcdoc="' + srcdoc + '" '; + } else { + srcdoc = ''; + } + + if (loading !== undefined && loading !== null && loading !== "") { + loading = 'loading '; + } else { + loading = ''; + } + + video_frame = ''; return video_frame; }); }, From 64dd5b91c48f132afd1b8564a0fa13bda4bcb501 Mon Sep 17 00:00:00 2001 From: Boulaffas Amine Date: Mon, 17 May 2021 08:39:24 +0100 Subject: [PATCH 27/28] Youtube (Js API) URI redirect to Error 404 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Error 404 (Introuvable)!!1 L'URL demandée est introuvable sur ce serveur. --- tarteaucitron.services.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js index 3519dde..98cc3db 100644 --- a/tarteaucitron.services.js +++ b/tarteaucitron.services.js @@ -4061,7 +4061,7 @@ tarteaucitron.services.youtubeapi = { "key": "youtubeapi", "type": "video", "name": "Youtube (Js API)", - "uri": "https://policies.google.com/privacy/", + "uri": "https://policies.google.com/privacy", "needConsent": true, "cookies": [], "js": function () { From d3b6f63e5bc27215fa75f9e434a7a8dfb7cbfd26 Mon Sep 17 00:00:00 2001 From: Amauri CHAMPEAUX Date: Thu, 20 May 2021 18:59:08 +0200 Subject: [PATCH 28/28] Check if cookie exist before purge --- tarteaucitron.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tarteaucitron.js b/tarteaucitron.js index 31367cb..f3821de 100644 --- a/tarteaucitron.js +++ b/tarteaucitron.js @@ -1534,9 +1534,13 @@ var tarteaucitron = { var i; for (i = 0; i < arr.length; i += 1) { - document.cookie = arr[i] + '=; expires=Thu, 01 Jan 2000 00:00:00 GMT; path=/;'; - document.cookie = arr[i] + '=; expires=Thu, 01 Jan 2000 00:00:00 GMT; path=/; domain=.' + location.hostname + ';'; - document.cookie = arr[i] + '=; expires=Thu, 01 Jan 2000 00:00:00 GMT; path=/; domain=.' + location.hostname.split('.').slice(-2).join('.') + ';'; + + var rgxpCookie = new RegExp("^(.*;)?\\s*" + arr[i] + "\\s*=\\s*[^;]+(.*)?$"); + if (document.cookie.match(rgxpCookie)) { + document.cookie = arr[i] + '=; expires=Thu, 01 Jan 2000 00:00:00 GMT; path=/;'; + document.cookie = arr[i] + '=; expires=Thu, 01 Jan 2000 00:00:00 GMT; path=/; domain=.' + location.hostname + ';'; + document.cookie = arr[i] + '=; expires=Thu, 01 Jan 2000 00:00:00 GMT; path=/; domain=.' + location.hostname.split('.').slice(-2).join('.') + ';'; + } } }, "checkCount": function (key) {