Skip to content

Commit b636eb7

Browse files
author
Micajuine Ho
committed
Merge branch 'master' into remove_consent_v2
2 parents 7064ee3 + 41a29e7 commit b636eb7

55 files changed

Lines changed: 3394 additions & 3685 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ads/_config.js‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,6 @@ const adConfig = jsonConfiguration({
476476
},
477477

478478
'forkmedia': {
479-
prefetch: 'https://delivery.forkcdn.com/rappio/inread/v1.1/amp/inread.js',
480479
renderStartImplemented: true,
481480
},
482481

@@ -1049,7 +1048,13 @@ const adConfig = jsonConfiguration({
10491048
consentHandlingOverride: true,
10501049
},
10511050

1052-
'temedya': {},
1051+
'temedya': {
1052+
prefetch: [
1053+
'https://vidyome-com.cdn.vidyome.com/vidyome/builds/temedya-amp.js',
1054+
'https://vidyome-com.cdn.vidyome.com/vidyome/builds/widgets.js',
1055+
],
1056+
renderStartImplemented: true,
1057+
},
10531058

10541059
'torimochi': {
10551060
renderStartImplemented: true,

‎ads/forkmedia.js‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,30 @@
1414
* limitations under the License.
1515
*/
1616

17-
import {loadScript, validateData} from '../3p/3p';
17+
import {loadScript} from '../3p/3p';
1818

1919
/**
2020
* @param {!Window} global
2121
* @param {!Object} data
2222
*/
2323
export function forkmedia(global, data) {
24-
validateData(data, ['product']);
25-
2624
let src = null;
2725
if (data.product === 'inread') {
2826
src = 'https://delivery.forkcdn.com/rappio/inread/v1.1/amp/inread.js';
29-
}
30-
31-
if (src) {
32-
loadScript(
33-
global,
34-
src,
35-
() => {
36-
global.context.renderStart();
37-
},
38-
() => {
39-
global.context.noContentAvailable();
40-
}
41-
);
27+
} else if (data.product === 'vibe') {
28+
src = 'https://vibecdn.forkcdn.com/Inarticle/amp/iav.js';
4229
} else {
43-
global.context.noContentAvailable();
30+
src = 'https://delivery.forkcdn.com/amp/default.js';
4431
}
32+
33+
loadScript(
34+
global,
35+
src,
36+
() => {
37+
global.context.renderStart();
38+
},
39+
() => {
40+
global.context.noContentAvailable();
41+
}
42+
);
4543
}

‎build-system/global-configs/canary-config.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"amp-ad-ff-adx-ady": 0.01,
1515
"amp-auto-ads-adsense-holdout": 0.1,
1616
"amp-auto-ads-no-op-experiment": 0.05,
17-
"amp-consent-geo-override": 1,
1817
"amp-mega-menu": 1,
1918
"amp-nested-menu": 1,
2019
"amp-playbuzz": 1,

‎build-system/global-configs/prod-config.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"amp-ad-ff-adx-ady": 0.01,
1515
"amp-auto-ads-adsense-holdout": 0.1,
1616
"amp-auto-ads-no-op-experiment": 0.05,
17-
"amp-consent-geo-override": 1,
1817
"amp-mega-menu": 1,
1918
"amp-nested-menu": 1,
2019
"amp-playbuzz": 1,

‎build-system/tasks/e2e/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"devDependencies": {
77
"@babel/register": "7.8.3",
88
"babel-regenerator-runtime": "6.5.0",
9-
"chromedriver": "80.0.0",
9+
"chromedriver": "80.0.1",
1010
"puppeteer": "2.1.1",
1111
"geckodriver": "1.19.1",
1212
"selenium-webdriver": "4.0.0-alpha.5"

0 commit comments

Comments
 (0)