diff --git a/.eslintrc.js b/.eslintrc.js index e6975951f06..02ff81614c7 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -26,7 +26,6 @@ module.exports = { // Violations of these styles should be fixed, and the exceptions removed over time. // // See Issue #1111. - "camelcase": "off", "eqeqeq": "off", "no-return-assign": "off", "no-throw-literal": "off", diff --git a/modules/adkernelAdnBidAdapter.js b/modules/adkernelAdnBidAdapter.js index e20f58d43f6..60c33170b3c 100644 --- a/modules/adkernelAdnBidAdapter.js +++ b/modules/adkernelAdnBidAdapter.js @@ -165,7 +165,7 @@ export const spec = { return serverResponses.filter(rps => rps.body && rps.body.syncpages) .map(rsp => rsp.body.syncpages) .reduce((a, b) => a.concat(b), []) - .map(sync_url => ({type: 'iframe', url: sync_url})); + .map(syncUrl => ({type: 'iframe', url: syncUrl})); } }; diff --git a/modules/adkernelBidAdapter.js b/modules/adkernelBidAdapter.js index e9f88e9a3ef..dffcaacec3d 100644 --- a/modules/adkernelBidAdapter.js +++ b/modules/adkernelBidAdapter.js @@ -87,7 +87,7 @@ export const spec = { return serverResponses.filter(rsp => rsp.body && rsp.body.ext && rsp.body.ext.adk_usersync) .map(rsp => rsp.body.ext.adk_usersync) .reduce((a, b) => a.concat(b), []) - .map(sync_url => ({type: 'iframe', url: sync_url})); + .map(syncUrl => ({type: 'iframe', url: syncUrl})); } }; diff --git a/modules/andbeyondBidAdapter.js b/modules/andbeyondBidAdapter.js index 1a3535f4704..710d75aec6d 100644 --- a/modules/andbeyondBidAdapter.js +++ b/modules/andbeyondBidAdapter.js @@ -86,7 +86,7 @@ export const spec = { return serverResponses.filter(rsp => rsp.body && rsp.body.ext && rsp.body.ext.adk_usersync) .map(rsp => rsp.body.ext.adk_usersync) .reduce((a, b) => a.concat(b), []) - .map(sync_url => ({type: 'iframe', url: sync_url})); + .map(syncUrl => ({type: 'iframe', url: syncUrl})); } }; diff --git a/modules/audienceNetworkBidAdapter.js b/modules/audienceNetworkBidAdapter.js index 7256ce99e73..5e9053dfc40 100644 --- a/modules/audienceNetworkBidAdapter.js +++ b/modules/audienceNetworkBidAdapter.js @@ -14,7 +14,7 @@ const method = 'GET'; const url = 'https://an.facebook.com/v2/placementbid.json'; const supportedMediaTypes = ['banner', 'video']; const netRevenue = true; -const hb_bidder = 'fan'; +const hbBidder = 'fan'; const platver = '$prebid.version$'; const platform = '241394079772386'; const adapterver = '1.0.0'; @@ -205,14 +205,14 @@ const interpretResponse = ({ body }, { adformats, requestIds, sizes }) => { // transform to bidResponse .map((bid, i) => { const { - bid_id: fb_bidid, + bid_id: fbBidid, placement_id: creativeId, bid_price_cents: cpm } = bid; const format = adformats[i]; const [width, height] = expandSize(flattenSize(sizes[i])); - const ad = createAdHtml(creativeId, format, fb_bidid); + const ad = createAdHtml(creativeId, format, fbBidid); const requestId = requestIds[i]; const bidResponse = { @@ -227,8 +227,8 @@ const interpretResponse = ({ body }, { adformats, requestIds, sizes }) => { netRevenue, currency, // Audience Network attributes - hb_bidder, - fb_bidid, + hb_bidder: hbBidder, + fb_bidid: fbBidid, fb_format: format, fb_placementid: creativeId }; @@ -236,7 +236,7 @@ const interpretResponse = ({ body }, { adformats, requestIds, sizes }) => { if (isVideo(format)) { const pageurl = getTopWindowUrlEncoded(); bidResponse.mediaType = 'video'; - bidResponse.vastUrl = `https://an.facebook.com/v1/instream/vast.xml?placementid=${creativeId}&pageurl=${pageurl}&playerwidth=${width}&playerheight=${height}&bidid=${fb_bidid}`; + bidResponse.vastUrl = `https://an.facebook.com/v1/instream/vast.xml?placementid=${creativeId}&pageurl=${pageurl}&playerwidth=${width}&playerheight=${height}&bidid=${fbBidid}`; } return bidResponse; }); diff --git a/modules/bridgewellBidAdapter.js b/modules/bridgewellBidAdapter.js index 222f904f276..65fa49a25f8 100644 --- a/modules/bridgewellBidAdapter.js +++ b/modules/bridgewellBidAdapter.js @@ -164,35 +164,35 @@ export const spec = { return; } - let req_nativeLayout = req.mediaTypes.native; - let res_native = matchedResponse.native; + let reqNativeLayout = req.mediaTypes.native; + let resNative = matchedResponse.native; // check title - let title = req_nativeLayout.title; + let title = reqNativeLayout.title; if (title && title.required) { - if (typeof res_native.title !== 'string') { + if (typeof resNative.title !== 'string') { return; - } else if (title.len && title.len < res_native.title.length) { + } else if (title.len && title.len < resNative.title.length) { return; } } // check body - let body = req_nativeLayout.body; + let body = reqNativeLayout.body; if (body && body.required) { - if (typeof res_native.body !== 'string') { + if (typeof resNative.body !== 'string') { return; } } // check image - let image = req_nativeLayout.image; + let image = reqNativeLayout.image; if (image && image.required) { - if (res_native.image) { - if (typeof res_native.image.url !== 'string') { // check image url + if (resNative.image) { + if (typeof resNative.image.url !== 'string') { // check image url return; } else { - if (res_native.image.width !== image.sizes[0] || res_native.image.height !== image.sizes[1]) { // check image sizes + if (resNative.image.width !== image.sizes[0] || resNative.image.height !== image.sizes[1]) { // check image sizes return; } } @@ -202,21 +202,21 @@ export const spec = { } // check sponsoredBy - let sponsoredBy = req_nativeLayout.sponsoredBy; + let sponsoredBy = reqNativeLayout.sponsoredBy; if (sponsoredBy && sponsoredBy.required) { - if (typeof res_native.sponsoredBy !== 'string') { + if (typeof resNative.sponsoredBy !== 'string') { return; } } // check icon - let icon = req_nativeLayout.icon; + let icon = reqNativeLayout.icon; if (icon && icon.required) { - if (res_native.icon) { - if (typeof res_native.icon.url !== 'string') { // check icon url + if (resNative.icon) { + if (typeof resNative.icon.url !== 'string') { // check icon url return; } else { - if (res_native.icon.width !== icon.sizes[0] || res_native.icon.height !== icon.sizes[0]) { // check image sizes + if (resNative.icon.width !== icon.sizes[0] || resNative.icon.height !== icon.sizes[0]) { // check image sizes return; } } @@ -226,12 +226,12 @@ export const spec = { } // check clickUrl - if (typeof res_native.clickUrl !== 'string') { + if (typeof resNative.clickUrl !== 'string') { return; } // check clickTracker - let clickTrackers = res_native.clickTrackers; + let clickTrackers = resNative.clickTrackers; if (clickTrackers) { if (clickTrackers.length === 0) { return; @@ -241,7 +241,7 @@ export const spec = { } // check impressionTrackers - let impressionTrackers = res_native.impressionTrackers; + let impressionTrackers = resNative.impressionTrackers; if (impressionTrackers) { if (impressionTrackers.length === 0) { return; diff --git a/modules/etargetBidAdapter.js b/modules/etargetBidAdapter.js index 2ad524613c2..0804fa25e87 100644 --- a/modules/etargetBidAdapter.js +++ b/modules/etargetBidAdapter.js @@ -4,7 +4,7 @@ import {registerBidder} from 'src/adapters/bidderFactory'; import { BANNER, VIDEO } from 'src/mediaTypes'; const BIDDER_CODE = 'etarget'; -const country_map = { +const countryMap = { 1: 'sk', 2: 'cz', 3: 'hu', @@ -28,18 +28,18 @@ export const spec = { var i, l, bid, reqParams, netRevenue, gdprObject; var request = []; var bids = JSON.parse(JSON.stringify(validBidRequests)); - var last_contry = 'sk'; + var lastContry = 'sk'; for (i = 0, l = bids.length; i < l; i++) { bid = bids[i]; - if (country_map[bid.params.country]) { - last_contry = country_map[bid.params.country]; + if (countryMap[bid.params.country]) { + lastContry = countryMap[bid.params.country]; } reqParams = bid.params; reqParams.transactionId = bid.transactionId; request.push(formRequestUrl(reqParams)); } - request.unshift('//' + last_contry + '.search.etargetnet.com/hb/?hbget=1'); + request.unshift('//' + lastContry + '.search.etargetnet.com/hb/?hbget=1'); netRevenue = 'net'; if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) { diff --git a/modules/nasmediaAdmixerBidAdapter.js b/modules/nasmediaAdmixerBidAdapter.js index 7de5c638c9e..5b403b21b08 100644 --- a/modules/nasmediaAdmixerBidAdapter.js +++ b/modules/nasmediaAdmixerBidAdapter.js @@ -61,10 +61,10 @@ export const spec = { function getOsType() { let ua = navigator.userAgent.toLowerCase(); let os = ['android', 'ios', 'mac', 'linux', 'window']; - let regexp_os = [/android/i, /iphone|ipad/i, /mac/i, /linux/i, /window/i]; + let regexpOs = [/android/i, /iphone|ipad/i, /mac/i, /linux/i, /window/i]; return find(os, (tos, idx) => { - if (ua.match(regexp_os[idx])) { + if (ua.match(regexpOs[idx])) { return os[idx]; } }) || 'etc'; diff --git a/modules/polluxBidAdapter.js b/modules/polluxBidAdapter.js index 463de07341c..577ff57670e 100644 --- a/modules/polluxBidAdapter.js +++ b/modules/polluxBidAdapter.js @@ -34,7 +34,7 @@ export const spec = { return []; } const payload = []; - let custom_url = null; + let customUrl = null; for (let i = 0; i < validBidRequests.length; i++) { const bid = validBidRequests[i]; const request = { @@ -42,8 +42,8 @@ export const spec = { zones: bid.params.zone, sizes: bid.sizes }; - if (bid.bidderUrl && !custom_url) { - custom_url = bid.bidderUrl; + if (bid.bidderUrl && !customUrl) { + customUrl = bid.bidderUrl; } payload.push(request); } @@ -51,24 +51,24 @@ export const spec = { // build url parameters const domain = utils.getParameterByName('domain'); const tracker2 = utils.getParameterByName('tracker2'); - const url_params = {}; + const urlParams = {}; if (domain) { - url_params.domain = domain; + urlParams.domain = domain; } else { - url_params.domain = utils.getTopWindowUrl(); + urlParams.domain = utils.getTopWindowUrl(); } if (tracker2) { - url_params.tracker2 = tracker2; + urlParams.tracker2 = tracker2; } // build url - let bidder_url = custom_url || PLX_ENDPOINT_URL; - if (url_params) { - bidder_url = bidder_url + '?' + utils.parseQueryStringParameters(url_params); + let bidderUrl = customUrl || PLX_ENDPOINT_URL; + if (urlParams) { + bidderUrl = bidderUrl + '?' + utils.parseQueryStringParameters(urlParams); } - utils.logMessage('== ' + BIDDER_CODE + ' == request built: ' + bidder_url); + utils.logMessage('== ' + BIDDER_CODE + ' == request built: ' + bidderUrl); return { method: 'POST', - url: bidder_url, + url: bidderUrl, data: payloadString }; }, diff --git a/modules/realvuAnalyticsAdapter.js b/modules/realvuAnalyticsAdapter.js index 7dbb309ea18..1ce854b539e 100644 --- a/modules/realvuAnalyticsAdapter.js +++ b/modules/realvuAnalyticsAdapter.js @@ -356,15 +356,15 @@ window.top1.realvu_aa = window.top1.realvu_aa || { } if (a.riff === '') { a.riff = a.r; - let vr_score = z.score(a, 'v:r'); - if (vr_score != null) { - if (a.r == 'no' && vr_score > 75) { + let vrScore = z.score(a, 'v:r'); + if (vrScore != null) { + if (a.r == 'no' && vrScore > 75) { a.riff = 'yes'; } } - let vv0_score = z.score(a, 'v:v0'); - if (vv0_score != null) { - if (a.r == 'yes' && vv0_score < (30 + 25 * Math.random())) { + let vv0Score = z.score(a, 'v:v0'); + if (vv0Score != null) { + if (a.r == 'yes' && vv0Score < (30 + 25 * Math.random())) { a.riff = 'no'; } } @@ -439,20 +439,20 @@ window.top1.realvu_aa = window.top1.realvu_aa || { return par.offsetParent; } } - let not_friendly = false; + let notFriendly = false; let ain = null; let tn = a.tagName; if (tn == 'HEAD' || tn == 'SCRIPT') return null; if (tn == 'IFRAME') { ain = this.doc(a); if (ain == null) { - not_friendly = true; + notFriendly = true; } else { a = ain; tn = a.tagName; } } - if (not_friendly || tn == 'OBJECT' || tn == 'IMG' || tn == 'EMBED' || tn == 'SVG' || tn == 'CANVAS' || + if (notFriendly || tn == 'OBJECT' || tn == 'IMG' || tn == 'EMBED' || tn == 'SVG' || tn == 'CANVAS' || (tn == 'DIV' && a.style.backgroundImage)) { let w1 = a.offsetWidth; let h1 = a.offsetHeight; @@ -658,12 +658,12 @@ window.top1.realvu_aa = window.top1.realvu_aa || { return null; }, // API functions - addUnitById: function (partner_id, unit_id, callback, delay) { - let p1 = partner_id; + addUnitById: function (partnerId, unitId, callback, delay) { + let p1 = partnerId; if (typeof (p1) == 'string') { p1 = { - partner_id: partner_id, - unit_id: unit_id, + partner_id: partnerId, + unit_id: unitId, callback: callback, delay: delay }; @@ -676,25 +676,25 @@ window.top1.realvu_aa = window.top1.realvu_aa || { // b==true - add/update, b==false - update only if (args.cpm == 0) return; // collect only bids submitted const boost = window.top1.realvu_aa; - let push_bid = false; + let pushBid = false; let adi = null; if (!b) { // update only if already checked in by xyzBidAdapter for (let i = 0; i < boost.ads.length; i++) { adi = boost.ads[i]; if (adi.unit_id == args.adUnitCode) { - push_bid = true; + pushBid = true; break; } } } else { - push_bid = true; + pushBid = true; adi = window.top1.realvu_aa.check({ unit_id: args.adUnitCode, size: args.size, partner_id: partnerId }); } - if (push_bid) { + if (pushBid) { let pb = { bidder: args.bidder, cpm: args.cpm, @@ -715,10 +715,10 @@ window.top1.realvu_aa = window.top1.realvu_aa || { checkBidWon: function(partnerId, args, b) { // b==true - add/update, b==false - update only const z = this; - const unit_id = args.adUnitCode; + const unitId = args.adUnitCode; for (let i = 0; i < z.ads.length; i++) { let adi = z.ads[i]; - if (adi.unit_id == unit_id) { + if (adi.unit_id == unitId) { for (let j = 0; j < adi.bids.length; j++) { let bj = adi.bids[j]; if (bj.adId == args.adId) { @@ -754,10 +754,10 @@ window.top1.realvu_aa = window.top1.realvu_aa || { return rpt; }, - getStatusById: function (unit_id) { // return status object + getStatusById: function (unitId) { // return status object for (let i = 0; i < this.ads.length; i++) { let adi = this.ads[i]; - if (adi.unit_id == unit_id) return this.fmt(adi); + if (adi.unit_id == unitId) return this.fmt(adi); } return null; }, diff --git a/modules/rtbdemandadkBidAdapter.js b/modules/rtbdemandadkBidAdapter.js index a7ec8463c17..f199f20be56 100644 --- a/modules/rtbdemandadkBidAdapter.js +++ b/modules/rtbdemandadkBidAdapter.js @@ -96,7 +96,7 @@ export const spec = { return serverResponses.filter(rsp => rsp.body && rsp.body.ext && rsp.body.ext.adk_usersync) .map(rsp => rsp.body.ext.adk_usersync) .reduce((a, b) => a.concat(b), []) - .map(sync_url => ({type: 'iframe', url: sync_url})); + .map(syncUrl => ({type: 'iframe', url: syncUrl})); } }; diff --git a/modules/rtbhouseBidAdapter.js b/modules/rtbhouseBidAdapter.js index 678e156c5e6..bb527528e43 100644 --- a/modules/rtbhouseBidAdapter.js +++ b/modules/rtbhouseBidAdapter.js @@ -41,9 +41,9 @@ function mapBanner(slot) { /** * Produce openRTB banner.format object */ -function mapSizes(slot_sizes) { +function mapSizes(slotSizes) { const format = []; - slot_sizes.forEach(elem => { + slotSizes.forEach(elem => { format.push({ w: elem[0], h: elem[1] diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js index e5e3c390740..e77b247a349 100644 --- a/modules/rubiconBidAdapter.js +++ b/modules/rubiconBidAdapter.js @@ -506,13 +506,13 @@ function _getDigiTrustQueryParams() { * @returns {string} */ function _getPageUrl(bidRequest) { - let page_url = config.getConfig('pageUrl'); + let pageUrl = config.getConfig('pageUrl'); if (bidRequest.params.referrer) { - page_url = bidRequest.params.referrer; - } else if (!page_url) { - page_url = utils.getTopWindowUrl(); + pageUrl = bidRequest.params.referrer; + } else if (!pageUrl) { + pageUrl = utils.getTopWindowUrl(); } - return bidRequest.params.secure ? page_url.replace(/^http:/i, 'https:') : page_url; + return bidRequest.params.secure ? pageUrl.replace(/^http:/i, 'https:') : pageUrl; } function _renderCreative(script, impId) { diff --git a/modules/sekindoUMBidAdapter.js b/modules/sekindoUMBidAdapter.js index ffaaa2c1c62..66002ba7e1b 100644 --- a/modules/sekindoUMBidAdapter.js +++ b/modules/sekindoUMBidAdapter.js @@ -62,7 +62,7 @@ export const spec = { if (bidRequest.mediaType === 'video' || (typeof bidRequest.mediaTypes == 'object' && typeof bidRequest.mediaTypes.video == 'object')) { queryString = utils.tryAppendQueryString(queryString, 'x', bidRequest.params.playerWidth); queryString = utils.tryAppendQueryString(queryString, 'y', bidRequest.params.playerHeight); - if (typeof vid_vastType != 'undefined') { + if (typeof vid_vastType != 'undefined') { // eslint-disable-line camelcase queryString = utils.tryAppendQueryString(queryString, 'vid_vastType', bidRequest.params.vid_vastType); } if (typeof bidRequest.mediaTypes == 'object' && typeof bidRequest.mediaTypes.video == 'object' && typeof bidRequest.mediaTypes.video.context == 'string') { diff --git a/modules/sonobiBidAdapter.js b/modules/sonobiBidAdapter.js index 289d42d1719..3d9ad2ce976 100644 --- a/modules/sonobiBidAdapter.js +++ b/modules/sonobiBidAdapter.js @@ -185,16 +185,16 @@ function _validateFloor (bid) { return ''; } -const _creative = (mediaType) => (sbi_dc, sbi_aid) => { +const _creative = (mediaType) => (sbiDc, sbiAid) => { if (mediaType === 'video') { - return _videoCreative(sbi_dc, sbi_aid) + return _videoCreative(sbiDc, sbiAid) } - const src = 'https://' + sbi_dc + 'apex.go.sonobi.com/sbi.js?aid=' + sbi_aid + '&as=null' + '&ref=' + getTopWindowLocation().href; + const src = 'https://' + sbiDc + 'apex.go.sonobi.com/sbi.js?aid=' + sbiAid + '&as=null' + '&ref=' + getTopWindowLocation().href; return ''; }; -function _videoCreative(sbi_dc, sbi_aid) { - return `https://${sbi_dc}apex.go.sonobi.com/vast.xml?vid=${sbi_aid}&ref=${getTopWindowLocation().href}` +function _videoCreative(sbiDc, sbiAid) { + return `https://${sbiDc}apex.go.sonobi.com/vast.xml?vid=${sbiAid}&ref=${getTopWindowLocation().href}` } function _getBidIdFromTrinityKey (key) { diff --git a/modules/trionBidAdapter.js b/modules/trionBidAdapter.js index c2488bd351a..e5acba1bf5e 100644 --- a/modules/trionBidAdapter.js +++ b/modules/trionBidAdapter.js @@ -85,12 +85,12 @@ function buildTrionUrlParams(bid) { var url = utils.getTopWindowUrl(); var sizes = utils.parseSizesInput(bid.sizes).join(','); - var int_t = window.TR_INT_T && window.TR_INT_T != -1 ? window.TR_INT_T : null; - if (!int_t) { - int_t = getStorageData(BASE_KEY + 'int_t'); + var intT = window.TR_INT_T && window.TR_INT_T != -1 ? window.TR_INT_T : null; + if (!intT) { + intT = getStorageData(BASE_KEY + 'int_t'); } - if (int_t) { - setStorageData(BASE_KEY + 'int_t', int_t) + if (intT) { + setStorageData(BASE_KEY + 'int_t', intT) } setStorageData(BASE_KEY + 'lps', pubId + ':' + sectionId); var trionUrl = ''; @@ -105,8 +105,8 @@ function buildTrionUrlParams(bid) { if (sizes) { trionUrl += 'sizes=' + sizes + '&'; } - if (int_t) { - trionUrl = utils.tryAppendQueryString(trionUrl, 'int_t', encodeURIComponent(int_t)); + if (intT) { + trionUrl = utils.tryAppendQueryString(trionUrl, 'int_t', encodeURIComponent(intT)); } // remove the trailing "&" @@ -150,8 +150,8 @@ export function acceptPostMessage(e) { if (message.indexOf(BASE_KEY + 'userId') !== 0) { return; } - var int_t = message.split(BASE_KEY + 'userId=')[1]; - if (int_t) { - setStorageData(BASE_KEY + 'int_t', int_t); + var intT = message.split(BASE_KEY + 'userId=')[1]; + if (intT) { + setStorageData(BASE_KEY + 'int_t', intT); } } diff --git a/modules/underdogmediaBidAdapter.js b/modules/underdogmediaBidAdapter.js index a4531968d31..184ecb6e930 100644 --- a/modules/underdogmediaBidAdapter.js +++ b/modules/underdogmediaBidAdapter.js @@ -66,14 +66,14 @@ export const spec = { mid.useCount = 0; } - var size_not_found = true; + var sizeNotFound = true; utils.parseSizesInput(bidParam.sizes).forEach(size => { if (size === mid.width + 'x' + mid.height) { - size_not_found = false; + sizeNotFound = false; } }); - if (size_not_found) { + if (sizeNotFound) { return; } diff --git a/modules/widespaceBidAdapter.js b/modules/widespaceBidAdapter.js index 2fb6c87c8df..f40a541aeb0 100644 --- a/modules/widespaceBidAdapter.js +++ b/modules/widespaceBidAdapter.js @@ -38,7 +38,7 @@ export const spec = { let serverRequests = []; const REQUEST_SERVER_URL = getEngineUrl(); const DEMO_DATA_PARAMS = ['gender', 'country', 'region', 'postal', 'city', 'yob']; - const PERF_DATA = getData(LS_KEYS.PERF_DATA).map(perf_data => JSON.parse(perf_data)); + const PERF_DATA = getData(LS_KEYS.PERF_DATA).map(perfData => JSON.parse(perfData)); const CUST_DATA = getData(LS_KEYS.CUST_DATA, false)[0]; const LC_UID = getLcuid(); diff --git a/package-lock.json b/package-lock.json index ae24e70fc80..4366f57423a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9339,7 +9339,10 @@ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=", "dev": true, - "optional": true + "optional": true, + "requires": { + "readable-stream": "2.0.6" + } }, "form-data": { "version": "2.0.0", diff --git a/src/auction.js b/src/auction.js index 49632fddcf0..e2db713dd93 100644 --- a/src/auction.js +++ b/src/auction.js @@ -425,12 +425,12 @@ export function getStandardBidderSettings(mediaType) { const mediaTypeGranularity = config.getConfig(`mediaTypePriceGranularity.${mediaType}`); const granularity = (typeof mediaType === 'string' && mediaTypeGranularity) ? ((typeof mediaTypeGranularity === 'string') ? mediaTypeGranularity : 'custom') : config.getConfig('priceGranularity'); - let bidder_settings = $$PREBID_GLOBAL$$.bidderSettings; - if (!bidder_settings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD]) { - bidder_settings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD] = {}; + let bidderSettings = $$PREBID_GLOBAL$$.bidderSettings; + if (!bidderSettings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD]) { + bidderSettings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD] = {}; } - if (!bidder_settings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD][CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING]) { - bidder_settings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD][CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING] = [ + if (!bidderSettings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD][CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING]) { + bidderSettings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD][CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING] = [ { key: 'hb_bidder', val: function (bidResponse) { @@ -483,7 +483,7 @@ export function getStandardBidderSettings(mediaType) { }, ] } - return bidder_settings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD]; + return bidderSettings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD]; } export function getKeyValueTargetingPairs(bidderCode, custBidObj) { @@ -492,18 +492,18 @@ export function getKeyValueTargetingPairs(bidderCode, custBidObj) { } var keyValues = {}; - var bidder_settings = $$PREBID_GLOBAL$$.bidderSettings; + var bidderSettings = $$PREBID_GLOBAL$$.bidderSettings; // 1) set the keys from "standard" setting or from prebid defaults - if (bidder_settings) { + if (bidderSettings) { // initialize default if not set const standardSettings = getStandardBidderSettings(custBidObj.mediaType); setKeys(keyValues, standardSettings, custBidObj); // 2) set keys from specific bidder setting override if they exist - if (bidderCode && bidder_settings[bidderCode] && bidder_settings[bidderCode][CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING]) { - setKeys(keyValues, bidder_settings[bidderCode], custBidObj); - custBidObj.sendStandardTargeting = bidder_settings[bidderCode].sendStandardTargeting; + if (bidderCode && bidderSettings[bidderCode] && bidderSettings[bidderCode][CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING]) { + setKeys(keyValues, bidderSettings[bidderCode], custBidObj); + custBidObj.sendStandardTargeting = bidderSettings[bidderCode].sendStandardTargeting; } } diff --git a/src/utils.js b/src/utils.js index be1b3fbf5e2..7845e1e9bb0 100644 --- a/src/utils.js +++ b/src/utils.js @@ -7,12 +7,12 @@ const CONSTANTS = require('./constants'); var _loggingChecked = false; -var t_Arr = 'Array'; -var t_Str = 'String'; -var t_Fn = 'Function'; -var t_Numb = 'Number'; -var t_Object = 'Object'; -var t_Boolean = 'Boolean'; +var tArr = 'Array'; +var tStr = 'String'; +var tFn = 'Function'; +var tNumb = 'Number'; +var tObject = 'Object'; +var tBoolean = 'Boolean'; var toString = Object.prototype.toString; let infoLogger = null; let warnLogger = null; @@ -405,27 +405,27 @@ exports.isA = function (object, _t) { }; exports.isFn = function (object) { - return exports.isA(object, t_Fn); + return exports.isA(object, tFn); }; exports.isStr = function (object) { - return exports.isA(object, t_Str); + return exports.isA(object, tStr); }; exports.isArray = function (object) { - return exports.isA(object, t_Arr); + return exports.isA(object, tArr); }; exports.isNumber = function(object) { - return exports.isA(object, t_Numb); + return exports.isA(object, tNumb); }; exports.isPlainObject = function(object) { - return exports.isA(object, t_Object); + return exports.isA(object, tObject); } exports.isBoolean = function(object) { - return exports.isA(object, t_Boolean); + return exports.isA(object, tBoolean); } /**