Skip to content
This repository has been archived by the owner on Apr 1, 2020. It is now read-only.

Bumping version of o-ads to include cookie consent check #1246

Merged
merged 4 commits into from
May 24, 2018
Merged

Bumping version of o-ads to include cookie consent check #1246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95aaf30
Bumping version of o-ads to include cookie consent check
andrewgeorgiou1981 May 24, 2018
0f90ee5
o-ads - Adding config property to disable cookie consent based on flag
andrewgeorgiou1981 May 24, 2018
bae3fe8
o-ads - Adding config property to disable cookie consent based on flag
andrewgeorgiou1981 May 24, 2018
00d80d8
bump bower and lint
doramatadora May 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"n-topic-search": "^1.0.0",
"n-ui-foundations": "^3.0.0",
"next-session-client": "^2.3.1",
"o-ads": "^8.3.0",
"o-ads": "^9.0.1",
"o-cookie-message": "^3.1.1",
"o-errors": "^3.5.1",
"o-expander": "^4.2.2",
Expand Down
5 changes: 3 additions & 2 deletions components/n-ui/ads/js/oAdsConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = function (flags, appName, adOptions) {
}
};

const validateAdsTrafficApi = ((flags.get('validateAdsTraffic') && flags.get('validateAdsTraffic')==='variant')) ? `${apiUrlRoot}validate-traffic` : null;
const validateAdsTrafficApi = ((flags.get('validateAdsTraffic') && flags.get('validateAdsTraffic') === 'variant')) ? `${apiUrlRoot}validate-traffic` : null;

function getContextualTargeting (appName) {
let uuid;
Expand Down Expand Up @@ -108,7 +108,8 @@ module.exports = function (flags, appName, adOptions) {
page: getContextualTargeting(appName),
usePageZone: true
},
validateAdsTrafficApi : validateAdsTrafficApi
validateAdsTrafficApi: validateAdsTrafficApi,
disableConsentCookie: flags.get('adsDisableCookieConsent') ? true : false
};

};