From a5e3c34830dba2a7e56ea71995ddabd668b65a53 Mon Sep 17 00:00:00 2001 From: Emma Imber Date: Tue, 24 Dec 2024 12:21:44 +0000 Subject: [PATCH 01/11] Migrate fabric-expandable template to Svelte --- src/templates/csr/fabric-expandable/ad.json | 3 + .../csr/fabric-expandable/index.html | 1 + .../csr/fabric-expandable/index.svelte | 206 ++++++++++++++++++ src/templates/csr/fabric-expandable/test.json | 65 ++++++ 4 files changed, 275 insertions(+) create mode 100644 src/templates/csr/fabric-expandable/ad.json create mode 100644 src/templates/csr/fabric-expandable/index.html create mode 100644 src/templates/csr/fabric-expandable/index.svelte create mode 100644 src/templates/csr/fabric-expandable/test.json diff --git a/src/templates/csr/fabric-expandable/ad.json b/src/templates/csr/fabric-expandable/ad.json new file mode 100644 index 00000000..1d13a211 --- /dev/null +++ b/src/templates/csr/fabric-expandable/ad.json @@ -0,0 +1,3 @@ +{ + "nativeStyleId": "79031" +} diff --git a/src/templates/csr/fabric-expandable/index.html b/src/templates/csr/fabric-expandable/index.html new file mode 100644 index 00000000..efa6e13b --- /dev/null +++ b/src/templates/csr/fabric-expandable/index.html @@ -0,0 +1 @@ +[%thirdPartyJSTracking%] diff --git a/src/templates/csr/fabric-expandable/index.svelte b/src/templates/csr/fabric-expandable/index.svelte new file mode 100644 index 00000000..eaec8ee6 --- /dev/null +++ b/src/templates/csr/fabric-expandable/index.svelte @@ -0,0 +1,206 @@ + + + + + + diff --git a/src/templates/csr/fabric-expandable/test.json b/src/templates/csr/fabric-expandable/test.json new file mode 100644 index 00000000..da0f2759 --- /dev/null +++ b/src/templates/csr/fabric-expandable/test.json @@ -0,0 +1,65 @@ +{ + "ClickthroughUrl": "", + "ScrollType": "none", + "ShowMoreType": "", + "BackgroundColour": "", + "BackgroundImage": "", + "BackgroundImagePosition": "", + "BackgroundImageRepeat": "", + "MobileBackgroundImage": "", + "MobileBackgroundImagePosition": "", + "MobileBackgroundImageRepeat": "", + "Slide1BackgroundColour": "", + "Slide1BackgroundImage": "", + "Slide1BackgroundRepeat": "", + "Slide1BackgroundPosition": "", + "Slide1MobileBackgroundImage": "", + "Slide1MobileBackgroundRepeat": "", + "Slide1MobileBackgroundPosition": "", + "Slide1Layer1BackgroundImage": "https://tpc.googlesyndication.com/simgad/17554758987417110030?", + "Slide1Layer1BackgroundRepeat": "no-repeat", + "Slide1Layer1BackgroundPosition": "center center", + "Slide1Layer1MobileBackgroundImage": "https://tpc.googlesyndication.com/simgad/12472120302988849309?", + "Slide1Layer1MobileBackgroundRepeat": "no-repeat", + "Slide1Layer1MobileBackgroundPosition": "center center", + "Slide1Layer2BackgroundImage": "https://tpc.googlesyndication.com/simgad/17554758987417110030?", + "Slide1Layer2BackgroundRepeat": "no-repeat", + "Slide1Layer2BackgroundPosition": "center center", + "Slide1Layer2MobileBackgroundImage": "", + "Slide1Layer2MobileBackgroundRepeat": "", + "Slide1Layer2MobileBackgroundPosition": "", + "Slide1Layer3BackgroundImage": "", + "Slide1Layer3BackgroundRepeat": "", + "Slide1Layer3BackgroundPosition": "", + "Slide1Layer3MobileBackgroundImage": "", + "Slide1Layer3MobileBackgroundRepeat": "", + "Slide1Layer3MobileBackgroundPosition": "", + "Slide2BackgroundColour": "", + "Slide2BackgroundImage": "", + "Slide2BackgroundRepeat": "", + "Slide2BackgroundPosition": "", + "Slide2MobileBackgroundImage": "", + "Slide2MobileBackgroundRepeat": "", + "Slide2MobileBackgroundPosition": "", + "Slide2Layer1BackgroundImage": "https://tpc.googlesyndication.com/simgad/4655436357172306837?", + "Slide2Layer1BackgroundRepeat": "no-repeat", + "Slide2Layer1BackgroundPosition": "center center", + "Slide2Layer1MobileBackgroundImage": "https://tpc.googlesyndication.com/simgad/2232758949767305138?", + "Slide2Layer1MobileBackgroundRepeat": "no-repeat", + "Slide2Layer1MobileBackgroundPosition": "center center", + "Slide2Layer2BackgroundImage": "https://tpc.googlesyndication.com/simgad/7054833562526198004?", + "Slide2Layer2BackgroundRepeat": "no-repeat", + "Slide2Layer2BackgroundPosition": "bottom left", + "Slide2Layer2MobileBackgroundImage": "https://tpc.googlesyndication.com/simgad/7268971793572049255?", + "Slide2Layer2MobileBackgroundRepeat": "no-repeat", + "Slide2Layer2MobileBackgroundPosition": "bottom left", + "Slide2Layer3BackgroundImage": "", + "Slide2Layer3BackgroundRepeat": "", + "Slide2Layer3BackgroundPosition": "", + "Slide2Layer3MobileBackgroundImage": "", + "Slide2Layer3MobileBackgroundRepeat": "", + "Slide2Layer3MobileBackgroundPosition": "", + "Trackingpixel": "", + "Researchpixel": "", + "Viewabilitypixel": "" +} From 00647aad560af7054c9483e094ed5e5d015243d8 Mon Sep 17 00:00:00 2001 From: Emma Imber Date: Tue, 24 Dec 2024 12:33:40 +0000 Subject: [PATCH 02/11] Use imported icon for arrow --- .../csr/fabric-expandable/index.svelte | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/src/templates/csr/fabric-expandable/index.svelte b/src/templates/csr/fabric-expandable/index.svelte index eaec8ee6..f55c619b 100644 --- a/src/templates/csr/fabric-expandable/index.svelte +++ b/src/templates/csr/fabric-expandable/index.svelte @@ -1,6 +1,7 @@ + + + + diff --git a/src/templates/csr/fabric-expandable/index.svelte b/src/templates/csr/fabric-expandable/index.svelte index f55c619b..0e857998 100644 --- a/src/templates/csr/fabric-expandable/index.svelte +++ b/src/templates/csr/fabric-expandable/index.svelte @@ -2,6 +2,7 @@ import type { GAMVariable } from '$lib/gam'; import Fabric from '$templates/components/Fabric.svelte'; import ArrowDown from '$templates/components/icons/ArrowDown.svelte'; + import CrossIcon from '$templates/components/icons/CrossIcon.svelte'; import SetHeightResizer from '$templates/components/SetHeightResizer.svelte'; export let Trackingpixel: GAMVariable; @@ -52,10 +53,6 @@ let expanded = false; - function toggleExpanded() { - expanded = !expanded; - } - let height: number = 250; @@ -86,7 +83,7 @@ MobileLayer3BackgroundPosition={Slide1Layer3MobileBackgroundPosition} /> -
+
- @@ -165,10 +154,7 @@ border-width: 1px; transition: transform 1s; transform: rotate(45deg); - } - - .toggle-cross[aria-expanded='true'] { - transform: rotate(0); + overflow: hidden; } .toggle-arrow { @@ -182,10 +168,4 @@ border-width: 1px 1px 0; opacity: 0.75; } - - svg { - display: inline-block; - vertical-align: middle; - overflow: hidden; - } From 457d2a609f6833ea670c0c9d9c929b4caf4f8b51 Mon Sep 17 00:00:00 2001 From: Emma Imber Date: Thu, 2 Jan 2025 12:44:29 +0000 Subject: [PATCH 04/11] Fabric expandable doesn't have thirdPartyJSTracking --- src/templates/csr/fabric-expandable/index.html | 1 - 1 file changed, 1 deletion(-) delete mode 100644 src/templates/csr/fabric-expandable/index.html diff --git a/src/templates/csr/fabric-expandable/index.html b/src/templates/csr/fabric-expandable/index.html deleted file mode 100644 index efa6e13b..00000000 --- a/src/templates/csr/fabric-expandable/index.html +++ /dev/null @@ -1 +0,0 @@ -[%thirdPartyJSTracking%] From e05a22283045f9f4d50f1ef7ac720b80685ba44e Mon Sep 17 00:00:00 2001 From: Emma Imber Date: Thu, 2 Jan 2025 12:45:31 +0000 Subject: [PATCH 05/11] Delete legacy template --- legacy/src/fabric-expandable/test.json | 65 -------------- legacy/src/fabric-expandable/web/ad.json | 3 - legacy/src/fabric-expandable/web/index.html | 76 ----------------- legacy/src/fabric-expandable/web/index.js | 52 ------------ legacy/src/fabric-expandable/web/index.scss | 94 --------------------- 5 files changed, 290 deletions(-) delete mode 100644 legacy/src/fabric-expandable/test.json delete mode 100644 legacy/src/fabric-expandable/web/ad.json delete mode 100644 legacy/src/fabric-expandable/web/index.html delete mode 100644 legacy/src/fabric-expandable/web/index.js delete mode 100644 legacy/src/fabric-expandable/web/index.scss diff --git a/legacy/src/fabric-expandable/test.json b/legacy/src/fabric-expandable/test.json deleted file mode 100644 index 71e3a654..00000000 --- a/legacy/src/fabric-expandable/test.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "ClickthroughUrl": "http://theirworld.org/campaigns/rewritingthecode", - "ScrollType": "parallax", - "ShowMoreType": "", - "BackgroundColour": "", - "BackgroundImage": "", - "BackgroundImagePosition": "", - "BackgroundImageRepeat": "", - "MobileBackgroundImage": "", - "MobileBackgroundImagePosition": "", - "MobileBackgroundImageRepeat": "", - "Slide1BackgroundColour": "", - "Slide1BackgroundImage": "https://tpc.googlesyndication.com/pagead/imgad?id=CICAgKCLv6KntgEQARgBMghEj7RYY2FDiA", - "Slide1BackgroundRepeat": "", - "Slide1BackgroundPosition": "", - "Slide1MobileBackgroundImage": "https://tpc.googlesyndication.com/pagead/imgad?id=CICAgKCLv-LlCRABGAEyCI7-kaw083xi", - "Slide1MobileBackgroundRepeat": "", - "Slide1MobileBackgroundPosition": "", - "Slide1Layer1BackgroundImage": "https://tpc.googlesyndication.com/pagead/imgad?id=CICAgKCLv5KxsAEQARgBMgir0sVRcAVsXg", - "Slide1Layer1BackgroundRepeat": "", - "Slide1Layer1BackgroundPosition": "", - "Slide1Layer1MobileBackgroundImage": "https://tpc.googlesyndication.com/pagead/imgad?id=CICAgKCLv6KHdhABGAEyCJT6FEHBdjsh", - "Slide1Layer1MobileBackgroundRepeat": "", - "Slide1Layer1MobileBackgroundPosition": "", - "Slide1Layer2BackgroundImage": "", - "Slide1Layer2BackgroundRepeat": "", - "Slide1Layer2BackgroundPosition": "", - "Slide1Layer2MobileBackgroundImage": "", - "Slide1Layer2MobileBackgroundRepeat": "", - "Slide1Layer2MobileBackgroundPosition": "", - "Slide1Layer3BackgroundImage": "", - "Slide1Layer3BackgroundRepeat": "", - "Slide1Layer3BackgroundPosition": "", - "Slide1Layer3MobileBackgroundImage": "", - "Slide1Layer3MobileBackgroundRepeat": "", - "Slide1Layer3MobileBackgroundPosition": "", - "Slide2BackgroundColour": "", - "Slide2BackgroundImage": "https://tpc.googlesyndication.com/pagead/imgad?id=CICAgKCLv6KXxAEQARgBMghJ4R6VaJj-hA", - "Slide2BackgroundRepeat": "", - "Slide2BackgroundPosition": "", - "Slide2MobileBackgroundImage": "https://tpc.googlesyndication.com/pagead/imgad?id=CICAgKCLv-KlGhABGAEyCDl6UjkFnK8-", - "Slide2MobileBackgroundRepeat": "", - "Slide2MobileBackgroundPosition": "", - "Slide2Layer1BackgroundImage": "https://tpc.googlesyndication.com/pagead/imgad?id=CICAgKCLv5LJFxABGAEyCHlADYzIiIuN", - "Slide2Layer1BackgroundRepeat": "", - "Slide2Layer1BackgroundPosition": "", - "Slide2Layer1MobileBackgroundImage": "https://tpc.googlesyndication.com/pagead/imgad?id=CICAgKCLv-L1LBABGAEyCJVHPIG4Ajxb", - "Slide2Layer1MobileBackgroundRepeat": "", - "Slide2Layer1MobileBackgroundPosition": "", - "Slide2Layer2BackgroundImage": "", - "Slide2Layer2BackgroundRepeat": "", - "Slide2Layer2BackgroundPosition": "", - "Slide2Layer2MobileBackgroundImage": "", - "Slide2Layer2MobileBackgroundRepeat": "", - "Slide2Layer2MobileBackgroundPosition": "", - "Slide2Layer3BackgroundImage": "", - "Slide2Layer3BackgroundRepeat": "", - "Slide2Layer3BackgroundPosition": "", - "Slide2Layer3MobileBackgroundImage": "", - "Slide2Layer3MobileBackgroundRepeat": "", - "Slide2Layer3MobileBackgroundPosition": "", - "Trackingpixel": "", - "Researchpixel": "", - "Viewabilitypixel": "" -} diff --git a/legacy/src/fabric-expandable/web/ad.json b/legacy/src/fabric-expandable/web/ad.json deleted file mode 100644 index 1d13a211..00000000 --- a/legacy/src/fabric-expandable/web/ad.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "nativeStyleId": "79031" -} diff --git a/legacy/src/fabric-expandable/web/index.html b/legacy/src/fabric-expandable/web/index.html deleted file mode 100644 index 041415ba..00000000 --- a/legacy/src/fabric-expandable/web/index.html +++ /dev/null @@ -1,76 +0,0 @@ -
-
- - - -
-
-
-
-
-
-
-
-
-
-
-
-
- - - -
-
-
-
-
-
-
-
-
-
-
-
- - -
diff --git a/legacy/src/fabric-expandable/web/index.js b/legacy/src/fabric-expandable/web/index.js deleted file mode 100644 index 1b0f116f..00000000 --- a/legacy/src/fabric-expandable/web/index.js +++ /dev/null @@ -1,52 +0,0 @@ -import { getIframeId, sendMessage, resizeIframeHeight, reportClicks } from '../../_shared/js/messages'; -import { enableToggles } from '../../_shared/js/ui'; -import { write, div } from '../../_shared/js/dom'; - -getIframeId() -.then(() => { - reportClicks(); - handleBackground(); - handleToggle(); -}); - -function handleBackground() { - let isMobile = window.matchMedia('(max-width: 739px)').matches; - let isTablet = window.matchMedia('(min-width: 740px) and (max-width: 979px)').matches; - let scrollType = '[%ScrollType%]'; - let backgroundColour = '[%BackgroundColour%]'; - let [ backgroundImage, backgroundPosition, backgroundRepeat, creativeLink ] = isMobile ? - ['[%MobileBackgroundImage%]', '[%MobileBackgroundImagePosition%]', '[%MobileBackgroundImageRepeat%]', document.getElementById('linkMobile')] : - ['[%BackgroundImage%]', '[%BackgroundImagePosition%]', '[%BackgroundImageRepeat%]', document.getElementById('linkDesktop')]; - - if (backgroundColour) { - document.documentElement.style.backgroundColor = backgroundColour; - } - - if( !backgroundImage ) return; - - if( scrollType === 'none' ) { - write(() => { - Object.assign(creativeLink.style, { - backgroundImage: `url('${backgroundImage}')`, - backgroundPosition, - backgroundRepeat - }); - }); - } else { - sendMessage('background', { - scrollType: scrollType === 'parallax' && (isMobile || isTablet) ? 'fixed' : scrollType, - backgroundColour, - backgroundImage: `url('${backgroundImage}')`, - backgroundRepeat, - backgroundPosition - }); - } -} - -function handleToggle() { - Array.from(document.getElementsByClassName('js-container')).forEach(root => enableToggles(root, true, onToggle)); -} - -function onToggle(isOpen) { - resizeIframeHeight(isOpen ? 500 : 250); -} diff --git a/legacy/src/fabric-expandable/web/index.scss b/legacy/src/fabric-expandable/web/index.scss deleted file mode 100644 index bafa09fd..00000000 --- a/legacy/src/fabric-expandable/web/index.scss +++ /dev/null @@ -1,94 +0,0 @@ -@import '_core'; - -.creative--fabric-expandable { - .creative__slide { - height: 250px; - } - - .creative__link { - height: 250px; - transition: height 1s; - - &[aria-expanded='true'] { - height: 500px; - } - } - - .creative__layer { - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - } - - .toggle { - box-sizing: border-box; - padding: 0; - position: absolute; - z-index: 100; - - background: #000000; - fill: #ffffff; - border-color: #ffffff; - border-style: solid; - box-shadow: 0 0 1px 0 #ffffff inset, 0 0 1px 0 #ffffff; - - &:focus { - outline: none; - } - } - - .toggle--arrow { - bottom: 0; - left: 50%; - width: 60px; - height: 30px; - margin-left: -30px; - - background-color: #333333; - border-radius: 20px 20px 0 0; - border-width: 1px 1px 0; - opacity: .75; - } - - .icon--arrow-down { - width: 24px; - } - - .toggle--cross { - top: 10px; - right: 10px; - - border-radius: 100%; - border-width: 1px; - - transition: transform 1s; - transform: rotate(45deg); - - &[aria-expanded='true'] { - transform: rotate(0); - } - - @include mq(tablet) { - right: calc(50% - #{(gs-span(9) + $gs-gutter) / 2}); - } - - @include mq(desktop) { - right: calc(50% - #{(gs-span(12) + $gs-gutter) / 2}); - } - - @include mq(leftCol) { - right: calc(50% - #{(gs-span(14) + $gs-gutter) / 2}); - } - - @include mq(wide) { - right: calc(50% - #{(gs-span($gs-max-columns) + $gs-gutter) / 2}); - } - } - - .show-more--arrow .toggle--cross, - .show-more--cross .toggle--arrow { - display: none; - } -} From bbd7a54c9da7e2a8a93903d32385f00f0f3a7fa5 Mon Sep 17 00:00:00 2001 From: Emma Imber Date: Thu, 2 Jan 2025 15:59:37 +0000 Subject: [PATCH 06/11] Use Resizer --- src/templates/csr/fabric-expandable/index.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/templates/csr/fabric-expandable/index.svelte b/src/templates/csr/fabric-expandable/index.svelte index 0e857998..5603f54b 100644 --- a/src/templates/csr/fabric-expandable/index.svelte +++ b/src/templates/csr/fabric-expandable/index.svelte @@ -3,7 +3,7 @@ import Fabric from '$templates/components/Fabric.svelte'; import ArrowDown from '$templates/components/icons/ArrowDown.svelte'; import CrossIcon from '$templates/components/icons/CrossIcon.svelte'; - import SetHeightResizer from '$templates/components/SetHeightResizer.svelte'; + import Resizer from '$templates/components/Resizer.svelte'; export let Trackingpixel: GAMVariable; export let Researchpixel: GAMVariable; @@ -53,7 +53,7 @@ let expanded = false; - let height: number = 250; + let height: number = -1; - +