From 2e886ec95f3776a9d8f545b9571a513f3fa24ce2 Mon Sep 17 00:00:00 2001 From: Edmilson Date: Tue, 27 Apr 2021 09:45:57 -0300 Subject: [PATCH 01/15] feat: Custom style --- extensions/amp-auto-ads/0.1/denakop-network-config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/amp-auto-ads/0.1/denakop-network-config.js b/extensions/amp-auto-ads/0.1/denakop-network-config.js index 25c4f06aa534..dd34f004e354 100644 --- a/extensions/amp-auto-ads/0.1/denakop-network-config.js +++ b/extensions/amp-auto-ads/0.1/denakop-network-config.js @@ -81,6 +81,7 @@ export class DenakopNetworkConfig { 'data-multi-size-validation': 'false', 'type': 'doubleclick', 'data-ad': 'denakop', + 'style': 'position:relative !important' }); return attributes; } From cc4eb725901bd773150d28b6820e7fe98c7c43b3 Mon Sep 17 00:00:00 2001 From: Edmilson Date: Tue, 27 Apr 2021 09:47:39 -0300 Subject: [PATCH 02/15] Revert "feat: Custom style" This reverts commit 2e886ec95f3776a9d8f545b9571a513f3fa24ce2. --- extensions/amp-auto-ads/0.1/denakop-network-config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/extensions/amp-auto-ads/0.1/denakop-network-config.js b/extensions/amp-auto-ads/0.1/denakop-network-config.js index dd34f004e354..25c4f06aa534 100644 --- a/extensions/amp-auto-ads/0.1/denakop-network-config.js +++ b/extensions/amp-auto-ads/0.1/denakop-network-config.js @@ -81,7 +81,6 @@ export class DenakopNetworkConfig { 'data-multi-size-validation': 'false', 'type': 'doubleclick', 'data-ad': 'denakop', - 'style': 'position:relative !important' }); return attributes; } From 8be40e1261ecd3fd3b57fb26c907610e6d62b7b3 Mon Sep 17 00:00:00 2001 From: Edmilson Date: Tue, 27 Apr 2021 09:48:40 -0300 Subject: [PATCH 03/15] feat: Add custom style --- extensions/amp-auto-ads/0.1/denakop-network-config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/amp-auto-ads/0.1/denakop-network-config.js b/extensions/amp-auto-ads/0.1/denakop-network-config.js index 25c4f06aa534..dd34f004e354 100644 --- a/extensions/amp-auto-ads/0.1/denakop-network-config.js +++ b/extensions/amp-auto-ads/0.1/denakop-network-config.js @@ -81,6 +81,7 @@ export class DenakopNetworkConfig { 'data-multi-size-validation': 'false', 'type': 'doubleclick', 'data-ad': 'denakop', + 'style': 'position:relative !important' }); return attributes; } From 5f791b8e930867c36e9636ce089fb356a84d709e Mon Sep 17 00:00:00 2001 From: Edmilson Date: Tue, 4 May 2021 18:35:11 -0300 Subject: [PATCH 04/15] test: Change tests --- extensions/amp-auto-ads/0.1/test/test-denakop-network-config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/amp-auto-ads/0.1/test/test-denakop-network-config.js b/extensions/amp-auto-ads/0.1/test/test-denakop-network-config.js index 2b2adb0e9695..30b203808c5f 100644 --- a/extensions/amp-auto-ads/0.1/test/test-denakop-network-config.js +++ b/extensions/amp-auto-ads/0.1/test/test-denakop-network-config.js @@ -85,6 +85,7 @@ describes.realWin( 'data-multi-size-validation': 'false', 'type': 'doubleclick', 'data-ad': 'denakop', + 'style': 'position:relative !important', }); }); From 386df3fe6068ee71315ff12baaabe6f505262cfb Mon Sep 17 00:00:00 2001 From: Edmilson Date: Mon, 10 May 2021 16:42:18 -0300 Subject: [PATCH 05/15] fix: Fix lint issues --- extensions/amp-auto-ads/0.1/denakop-network-config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/amp-auto-ads/0.1/denakop-network-config.js b/extensions/amp-auto-ads/0.1/denakop-network-config.js index dd34f004e354..30bfbe57ebbb 100644 --- a/extensions/amp-auto-ads/0.1/denakop-network-config.js +++ b/extensions/amp-auto-ads/0.1/denakop-network-config.js @@ -81,7 +81,7 @@ export class DenakopNetworkConfig { 'data-multi-size-validation': 'false', 'type': 'doubleclick', 'data-ad': 'denakop', - 'style': 'position:relative !important' + 'style': 'position:relative !important', }); return attributes; } From 631b80d150c3c4b882ec82ad3dcff6ce9f27736b Mon Sep 17 00:00:00 2001 From: Edmilson Date: Tue, 27 Apr 2021 09:45:57 -0300 Subject: [PATCH 06/15] feat: Custom style --- extensions/amp-auto-ads/0.1/denakop-network-config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/amp-auto-ads/0.1/denakop-network-config.js b/extensions/amp-auto-ads/0.1/denakop-network-config.js index f4570c2bfe65..bc7b1606a1ba 100644 --- a/extensions/amp-auto-ads/0.1/denakop-network-config.js +++ b/extensions/amp-auto-ads/0.1/denakop-network-config.js @@ -80,6 +80,7 @@ export class DenakopNetworkConfig { 'data-multi-size-validation': 'false', 'type': 'doubleclick', 'data-ad': 'denakop', + 'style': 'position:relative !important' }); return attributes; } From c952db6a034984620c9be4b47cd709ca2fd39ab1 Mon Sep 17 00:00:00 2001 From: Edmilson Date: Tue, 27 Apr 2021 09:47:39 -0300 Subject: [PATCH 07/15] Revert "feat: Custom style" This reverts commit 2e886ec95f3776a9d8f545b9571a513f3fa24ce2. --- extensions/amp-auto-ads/0.1/denakop-network-config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/extensions/amp-auto-ads/0.1/denakop-network-config.js b/extensions/amp-auto-ads/0.1/denakop-network-config.js index bc7b1606a1ba..f4570c2bfe65 100644 --- a/extensions/amp-auto-ads/0.1/denakop-network-config.js +++ b/extensions/amp-auto-ads/0.1/denakop-network-config.js @@ -80,7 +80,6 @@ export class DenakopNetworkConfig { 'data-multi-size-validation': 'false', 'type': 'doubleclick', 'data-ad': 'denakop', - 'style': 'position:relative !important' }); return attributes; } From be7e2b37fd094c270e6d6e5cdada40a5f5226790 Mon Sep 17 00:00:00 2001 From: Edmilson Date: Tue, 27 Apr 2021 09:48:40 -0300 Subject: [PATCH 08/15] feat: Add custom style --- extensions/amp-auto-ads/0.1/denakop-network-config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/amp-auto-ads/0.1/denakop-network-config.js b/extensions/amp-auto-ads/0.1/denakop-network-config.js index f4570c2bfe65..bc7b1606a1ba 100644 --- a/extensions/amp-auto-ads/0.1/denakop-network-config.js +++ b/extensions/amp-auto-ads/0.1/denakop-network-config.js @@ -80,6 +80,7 @@ export class DenakopNetworkConfig { 'data-multi-size-validation': 'false', 'type': 'doubleclick', 'data-ad': 'denakop', + 'style': 'position:relative !important' }); return attributes; } From b4959391f3bcd40acb811b13cd18f29be099dca1 Mon Sep 17 00:00:00 2001 From: Edmilson Date: Tue, 4 May 2021 18:35:11 -0300 Subject: [PATCH 09/15] test: Change tests --- extensions/amp-auto-ads/0.1/test/test-denakop-network-config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/amp-auto-ads/0.1/test/test-denakop-network-config.js b/extensions/amp-auto-ads/0.1/test/test-denakop-network-config.js index 2b2adb0e9695..30b203808c5f 100644 --- a/extensions/amp-auto-ads/0.1/test/test-denakop-network-config.js +++ b/extensions/amp-auto-ads/0.1/test/test-denakop-network-config.js @@ -85,6 +85,7 @@ describes.realWin( 'data-multi-size-validation': 'false', 'type': 'doubleclick', 'data-ad': 'denakop', + 'style': 'position:relative !important', }); }); From acc70bb167ec24ff3b84ad00216408723130ddcc Mon Sep 17 00:00:00 2001 From: Edmilson Date: Mon, 10 May 2021 16:42:18 -0300 Subject: [PATCH 10/15] fix: Fix lint issues --- extensions/amp-auto-ads/0.1/denakop-network-config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/amp-auto-ads/0.1/denakop-network-config.js b/extensions/amp-auto-ads/0.1/denakop-network-config.js index bc7b1606a1ba..8e8720f8a182 100644 --- a/extensions/amp-auto-ads/0.1/denakop-network-config.js +++ b/extensions/amp-auto-ads/0.1/denakop-network-config.js @@ -80,7 +80,7 @@ export class DenakopNetworkConfig { 'data-multi-size-validation': 'false', 'type': 'doubleclick', 'data-ad': 'denakop', - 'style': 'position:relative !important' + 'style': 'position:relative !important', }); return attributes; } From bac3fcaeb76255b25a6e0d5a8cdddb2ce25607f6 Mon Sep 17 00:00:00 2001 From: Edmilson Silva Date: Thu, 13 May 2021 16:35:59 -0300 Subject: [PATCH 11/15] Revert "fix: Fix lint issues" This reverts commit 386df3fe6068ee71315ff12baaabe6f505262cfb. --- extensions/amp-auto-ads/0.1/denakop-network-config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/amp-auto-ads/0.1/denakop-network-config.js b/extensions/amp-auto-ads/0.1/denakop-network-config.js index 8e8720f8a182..bc7b1606a1ba 100644 --- a/extensions/amp-auto-ads/0.1/denakop-network-config.js +++ b/extensions/amp-auto-ads/0.1/denakop-network-config.js @@ -80,7 +80,7 @@ export class DenakopNetworkConfig { 'data-multi-size-validation': 'false', 'type': 'doubleclick', 'data-ad': 'denakop', - 'style': 'position:relative !important', + 'style': 'position:relative !important' }); return attributes; } From 0347f9abae854a49c2a1607094b3b467f7c5c732 Mon Sep 17 00:00:00 2001 From: Edmilson Silva Date: Thu, 13 May 2021 16:44:08 -0300 Subject: [PATCH 12/15] fix: Fix lint issues --- extensions/amp-auto-ads/0.1/denakop-network-config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/amp-auto-ads/0.1/denakop-network-config.js b/extensions/amp-auto-ads/0.1/denakop-network-config.js index bc7b1606a1ba..8e8720f8a182 100644 --- a/extensions/amp-auto-ads/0.1/denakop-network-config.js +++ b/extensions/amp-auto-ads/0.1/denakop-network-config.js @@ -80,7 +80,7 @@ export class DenakopNetworkConfig { 'data-multi-size-validation': 'false', 'type': 'doubleclick', 'data-ad': 'denakop', - 'style': 'position:relative !important' + 'style': 'position:relative !important', }); return attributes; } From 4a8cbfce0a92c542dd4f577bd838b588c62f258d Mon Sep 17 00:00:00 2001 From: kelvinbiffi Date: Fri, 24 Sep 2021 00:44:16 -0300 Subject: [PATCH 13/15] amp-ad: Added logic to create a data vars slot id by unit when data-slot is entered --- extensions/amp-ad/0.1/amp-ad.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/extensions/amp-ad/0.1/amp-ad.js b/extensions/amp-ad/0.1/amp-ad.js index e1b5f1605b65..b926767d9801 100644 --- a/extensions/amp-ad/0.1/amp-ad.js +++ b/extensions/amp-ad/0.1/amp-ad.js @@ -69,11 +69,28 @@ export class AmpAd extends AMP.BaseElement { this.win.ampAdSlotIdCounter = this.win.ampAdSlotIdCounter || 0; const slotId = this.win.ampAdSlotIdCounter++; + let slotIdByUnit; + + if (this.element.hasAttribute('data-slot')) { + const dataSlot = this.element.getAttribute('data-slot'); + this.win.ampAdSlotIdByUnitCounter = + this.win.ampAdSlotIdByUnitCounter || {}; + slotIdByUnit = this.win.ampAdSlotIdByUnitCounter[dataSlot] || 0; + slotIdByUnit += 1; + this.win.ampAdSlotIdByUnitCounter[dataSlot] = slotIdByUnit; + } return new Promise((resolve) => { this.getVsync().mutate(() => { this.element.setAttribute('data-amp-slot-index', slotId); + if (this.element.hasAttribute('data-slot')) { + this.element.setAttribute( + 'data-vars-slot-id-by-unit', + slotIdByUnit + ); + } + const useRemoteHtml = this.element .getAmpDoc() .getMetaByName('amp-3p-iframe-src'); From 69c103bd0e11523d838cfc1824cd723cf7af44c2 Mon Sep 17 00:00:00 2001 From: kelvinbiffi Date: Fri, 24 Sep 2021 08:55:19 -0300 Subject: [PATCH 14/15] Changed counter by unit logic to use less code and changed property name from use id to index --- extensions/amp-ad/0.1/amp-ad.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/amp-ad/0.1/amp-ad.js b/extensions/amp-ad/0.1/amp-ad.js index b926767d9801..c14aaf3fb740 100644 --- a/extensions/amp-ad/0.1/amp-ad.js +++ b/extensions/amp-ad/0.1/amp-ad.js @@ -75,9 +75,9 @@ export class AmpAd extends AMP.BaseElement { const dataSlot = this.element.getAttribute('data-slot'); this.win.ampAdSlotIdByUnitCounter = this.win.ampAdSlotIdByUnitCounter || {}; - slotIdByUnit = this.win.ampAdSlotIdByUnitCounter[dataSlot] || 0; - slotIdByUnit += 1; - this.win.ampAdSlotIdByUnitCounter[dataSlot] = slotIdByUnit; + this.win.ampAdSlotIdByUnitCounter[dataSlot] = + this.win.ampAdSlotIdByUnitCounter[dataSlot] || 0; + slotIdByUnit = this.win.ampAdSlotIdByUnitCounter[dataSlot]++; } return new Promise((resolve) => { @@ -86,7 +86,7 @@ export class AmpAd extends AMP.BaseElement { if (this.element.hasAttribute('data-slot')) { this.element.setAttribute( - 'data-vars-slot-id-by-unit', + 'data-vars-slot-index-by-unit', slotIdByUnit ); } From 172b157334969902f67ce62c07db50ba42bc5985 Mon Sep 17 00:00:00 2001 From: kelvinbiffi Date: Wed, 27 Oct 2021 16:53:39 -0300 Subject: [PATCH 15/15] Added changes to logic who create the index by unitId --- extensions/amp-ad/0.1/amp-ad.js | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/extensions/amp-ad/0.1/amp-ad.js b/extensions/amp-ad/0.1/amp-ad.js index c14aaf3fb740..8c893f9c0c0e 100644 --- a/extensions/amp-ad/0.1/amp-ad.js +++ b/extensions/amp-ad/0.1/amp-ad.js @@ -69,26 +69,20 @@ export class AmpAd extends AMP.BaseElement { this.win.ampAdSlotIdCounter = this.win.ampAdSlotIdCounter || 0; const slotId = this.win.ampAdSlotIdCounter++; - let slotIdByUnit; - if (this.element.hasAttribute('data-slot')) { - const dataSlot = this.element.getAttribute('data-slot'); - this.win.ampAdSlotIdByUnitCounter = - this.win.ampAdSlotIdByUnitCounter || {}; - this.win.ampAdSlotIdByUnitCounter[dataSlot] = - this.win.ampAdSlotIdByUnitCounter[dataSlot] || 0; - slotIdByUnit = this.win.ampAdSlotIdByUnitCounter[dataSlot]++; - } + this.win.ampAdSlotIdByUnitCounter = + this.win.ampAdSlotIdByUnitCounter || {}; + const dataSlot = this.element.getAttribute('data-slot'); + this.win.ampAdSlotIdByUnitCounter[dataSlot] = + this.win.ampAdSlotIdByUnitCounter[dataSlot] || 0; + const unitSlotId = this.win.ampAdSlotIdByUnitCounter[dataSlot]++; return new Promise((resolve) => { this.getVsync().mutate(() => { this.element.setAttribute('data-amp-slot-index', slotId); if (this.element.hasAttribute('data-slot')) { - this.element.setAttribute( - 'data-vars-slot-index-by-unit', - slotIdByUnit - ); + this.element.setAttribute('data-amp-unit-slot-index', unitSlotId); } const useRemoteHtml = this.element